# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-07-20 23:37:09
# Node ID a1ae76f94c6f8bc9bc5cd3f2d8c9ed921bfbb2a3
# Parent  cc88f5c6132dea404909f835629b31637583837b

Use Full name instead of First name and surname.

See http://www.w3.org/International/questions/qa-personal-names.en.php?changelang=en

diff --git a/ennstatus/root/forms.py b/ennstatus/root/forms.py
--- a/ennstatus/root/forms.py
+++ b/ennstatus/root/forms.py
@@ -34,12 +34,9 @@ class MembershipForm(Form):
                             Email()
                         ]
                         )
-    firstname = StringField('First Name',
-                            validators=[Length(max=255)],
-                            )
-    surname = StringField('Surname',
-                          validators=[Length(max=255)],
-                          )
+    fullname = StringField('Full name',
+                           validators=[Length(max=65536)],
+                           )
     street = StringField('Nr., Street',
                          validators=[Length(max=4000)],
                          )
diff --git a/ennstatus/root/functions.py b/ennstatus/root/functions.py
--- a/ennstatus/root/functions.py
+++ b/ennstatus/root/functions.py
@@ -12,8 +12,7 @@ def send_membership_mail(form):
                                email=form.email.data,
                                membership=form.membership.data,
                                c3l=form.c3l.data,
-                               firstname=form.firstname.data,
-                               surname=form.surname.data,
+                               fullname=form.fullname.data,
                                street=form.street.data,
                                zip=form.zip.data,
                                city=form.city.data,
diff --git a/ennstatus/templates/root/membership.html b/ennstatus/templates/root/membership.html
--- a/ennstatus/templates/root/membership.html
+++ b/ennstatus/templates/root/membership.html
@@ -11,8 +11,7 @@
       {{ form.hidden_tag() }}
       {{ wtf.form_field(form.username, form_type='horizontal') }}
       {{ wtf.form_field(form.email, form_type='horizontal') }}
-      {{ wtf.form_field(form.firstname, form_type='horizontal') }}
-      {{ wtf.form_field(form.surname, form_type='horizontal') }}
+      {{ wtf.form_field(form.fullname, form_type='horizontal') }}
       {{ wtf.form_field(form.street, form_type='horizontal') }}
       {{ wtf.form_field(form.city, form_type='horizontal') }}
       {{ wtf.form_field(form.zip, form_type='horizontal') }}
diff --git a/ennstatus/templates/root/membership_mail.txt b/ennstatus/templates/root/membership_mail.txt
--- a/ennstatus/templates/root/membership_mail.txt
+++ b/ennstatus/templates/root/membership_mail.txt
@@ -9,8 +9,7 @@ Double Membership: {{ c3l }}
 
 Additional information:
 
-First Name: {{ firstname }}
-Surname: {{ surname }}
+Full name: {{ fullname }}
 Nr., Street: {{ street }}
 ZIP-Code: {{ zip }}
 City: {{ city }}