FVDE/ennstatus Changeset - 34da714bae58 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 34da714bae58

Parent rev.

Child rev.

[Not reviewed]

dev

0 5 0

Dennis Fink - 9 years ago 2015-10-25 16:10:25
dennis.fink@c3l.lu

Move submit fields directly into the corresponding form class

5 files changed with 7 insertions and 4 deletions:

ennstatus/donate/forms.py

ennstatus/root/forms.py

ennstatus/templates/donate/index.html

ennstatus/templates/donate/received.html

ennstatus/templates/root/contact.html

0 comments (0 inline, 0 general)

ennstatus/donate/forms.py

➞

Show inline comments

 from flask_wtf import Form
 from wtforms import SelectField
+from wtforms import SelectField, SubmitField
 from wtforms.validators import DataRequired
 class DateForm(Form):
     year = SelectField('Year', validators=[DataRequired()])
     month = SelectField('Month',
                         choices=[
                             ('{:02d}'.format(i), str(i)) for i in range(1, 13)
                         ],
                         validators=[DataRequired()])
     submit = SubmitField('Submit')

ennstatus/root/forms.py

➞

Show inline comments

@@ @@ -11,24 +11,25 @@ from wtforms.validators import InputRequ @@
 COUNTRIES = [
     ('luxembourg', 'Luxembourg'),
     ('belgium', 'Belgium'),
     ('france', 'France'),
     ('germany', 'Germany'),
+]
 class BPMForm(Form):
     country = SelectField('Country',
                           validators=[DataRequired()],
                           choices=COUNTRIES)
     submit = SubmitField('Submit')
 class MembershipForm(Form):
     username = StringField('Username*',
                            validators=[
                                InputRequired('This field is required!'),
                                Length(max=255)
+                           ]
+                           )
     email = StringField('E-Mail*',
                         validators=[

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -62,25 +62,25 @@ @@
     </div>
     <div class="col-md-4 clearfix">
       <div class="thumbnail">
         <center>
           <h3>SnailMail</h3>
         </center>
         <div class="well well-sm">
           <div class="pull-right">
             <form class="form-inline" role="form" method="POST" action"{{ url_for('donate.index') }}">
               {{ form.hidden_tag() }}
               <div class="form-group">
                 {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
-                <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
+                <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
               </div>
             </form>
           </div>
           <address>
             <strong>Frënn vun der Ënn, ASBL</strong><br>
                     BPM 381892<br>
                     {{ address['address'] }}<br>
                     {{ address['postal_code'] }}, {{ address['city'] }}<br>
                     {{ address['country'] }}
           </address>
         </div>
       </div>

ennstatus/templates/donate/received.html

➞

Show inline comments

@@ @@ -14,25 +14,25 @@ @@
       {% else %}
         <h3>Error!</h3>
       {% endif %}
     </div>
     <div class="pull-right">
       <form class="form-inline" role="form" method="POST" action="/donate/received">
         {{ form.hidden_tag() }}
         <div class="form-group">
           {{ form.year.label }}
           {{ form.year(class_='form-control input-sm') }}
           {{ form.month.label }}
           {{ form.month(class_='form-control input-sm') }}
-          <input type="submit" class="btn btn-enn btn-sm" value="Submit">
+          {{ form.submit(class_='btn btn-enn btn-sm') }}
         </div>
       </form>
     </div>
   </div>
   <div class="col-md-12">
     {% if csv_file %}
       {{ macros.create_donations_table(csv_file) }}
     {% else %}
       {% if year and month %}
         <p>No donations found for {{ '-'.join([year, month]) }}!</p>
       {% else %}
         <p>No donations found!</p>

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -7,25 +7,25 @@ @@
     <img src="{{ url_for('static', filename='images/Contact.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
     <div class="text-center">
       <h2>Contact</h2>
     </div>
   </div>
   <div class="col-md-8 clearfix">
     <h2 class="pull-left">General</h2>
     <div class="pull-right">
       <form class="form-inline" role="form" method="POST" action="{{ url_for('root.contact') }}">
         {{ form.hidden_tag()}}
         <div class="form-group">
           {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
-          <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
+          <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
         </div>
       </form>
     </div>
   </div>
   <div class="col-md-8">
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>
         BPM 381892<br>
         {{ address['address'] }}<br>
         {{ address['postal_code'] }}, {{ address['city'] }}<br>
         {{ address['country'] }}<br>

0 comments (0 inline, 0 general)