Changeset - eea35814153b
[Not reviewed]
default
0 3 0
Dennis Fink - 4 years ago 2021-06-14 20:45:03
dennis.fink@c3l.lu
Remove gpg, twitter and xmpp in the form
3 files changed with 0 insertions and 31 deletions:
0 comments (0 inline, 0 general)
c3l_membership/forms.py
Show inline comments
 
@@ -62,46 +62,39 @@ class MembershipForm(Form):
 
    street = StringField(
 
        "Nr., Street",
 
        validators=[Length(max=4000)],
 
    )
 
    zip = StringField(
 
        "Postal Code",
 
        validators=[Length(max=30)],
 
    )
 

	
 
    city = StringField(
 
        "City/Town",
 
        validators=[Length(max=500)],
 
    )
 

	
 
    state = StringField(
 
        "State/County/Province",
 
        validators=[Length(max=500)],
 
    )
 

	
 
    country = StringField(
 
        "Country",
 
        validators=[Length(max=500)],
 
    )
 

	
 
    gpg = StringField(
 
        "GPG-ID",
 
        validators=[Optional(), Length(max=18)],
 
    )
 
    jabber = StringField("Jabber Handle", validators=[Optional(), Email()])
 
    twitter = StringField("Twitter Handle", validators=[Optional()])
 

	
 
    terms = BooleanField(
 
        (
 
            "By submitting this membership application, you agree to have read and understood "
 
            'the <a href="http://statutes.c3l.lu">statutes of the Chaos Computer Club Lëtzebuerg A.S.B.L.</a>'
 
        ),
 
        validators=[InputRequired()],
 
    )
 

	
 
    minor_member = BooleanField(
 
        (
 
            "I am under 18 years of age and have the approval of my legal representative."
 
        ),
 
    )
 

	
 
    submit = SubmitField("Become a member")
c3l_membership/templates/index.html
Show inline comments
 
@@ -117,59 +117,41 @@
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.zip.label }}</b>
 
            {{ form.zip(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.city.label }}</b>
 
            {{ form.city(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.state.label }}</b>
 
            {{ form.state(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.country.label }}</b>
 
            {{ form.country(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.gpg.label }}</b>
 
            <b>{{ form.gpg(class="pure-u-1-1") }}</b>
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.jabber.label }}</b>
 
            {{ form.jabber(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <div class="pure-g">
 
          <div class="pure-u-1-1">
 
            <b>{{ form.twitter.label }}</b>
 
            {{ form.twitter(class="pure-u-1-1") }}
 
          </div>
 
        </div>
 
        <legend></legend>
 
        <label for="{{ form.minor_member.id }}" class="pure-checkbox">
 
          {{ form.minor_member }} {{ form.minor_member.label.text|safe}}
 
        </label>
 
        <label for="{{ form.terms.id }}" class="pure-checkbox">
 
          {{ form.terms }} {{ form.terms.label.text|safe }}
 
        </label>
 
        <div class="pure-controls">
 
          {{ form.submit }}
 
        </div>
 
      </fieldset>
 
    </form>
 
  </div>
 
  <div class="pure-u-md-1-3">
 
  </div>
 
</div>
 
{% endblock %}
c3l_membership/templates/member.html
Show inline comments
 
@@ -17,54 +17,48 @@
 
      <dt>Birthday:</dt>
 
      <dd>{{ form.birthday.data }}</dd>
 
      <dt>Street:</dt>
 
      <dd>{{ form.street.data if form.street.data else "<i>Not specified</i>"|safe }}</dd>
 
      <dt>ZIP-Code:</dt>
 
      <dd>{{ form.zip.data if form.zip.data else "<i>Not specified</i>"|safe }}</dd>
 
      <dt>City:</dt>
 
      <dd>{{ form.city.data if form.city.data else "<i>Not specified</i>"|safe }}</dd>
 
      <dt>State/County/Province:</dt>
 
      <dd>{{ form.state.data if form.state.data else "<i>Not specified</i>"|safe }}</dd>
 
      <dt>Country:</dt>
 
      <dd>{{ form.country.data if form.country.data else "<i>Not specified</i>"|safe }}</dd>
 
      <dt>Membership Plan:</dt>
 
      <dd>{{ form.membership.data }}</dd>
 
      <dt>Student:</dt>
 
      <dd>{{ "Yes" if form.student.data else "No" }}</dd>
 
      <dt>Starving:</dt>
 
      <dd>{{ "Yes" if form.starving.data else "No" }}</dd>
 
      <dt>Payment:</dt>
 
      <dd>{{ form.payment.data }}</dd>
 
      <dt>Agreed to Terms &amp; Conditions:</dt>
 
      <dd>{{ "Yes" if form.terms.data else "No" }}</dd>
 
      <dt>Minor Member:</dt>
 
      <dd>{{ "Yes" if form.minor_member.data else "No" }}</dd>
 
      <dt>GPG-ID:</dt>
 
      <dd>{{ form.gpg.data or "<i>Not specified</i>"|safe }}</dd>
 
      <dt>Jabber Handle:</dt>
 
      <dd>{{ form.jabber.data or "<i>Not specified</i>"|safe }}</dd>
 
      <dt>Twitter Handle:</dt>
 
      <dd>{{ form.twitter.data or "<i>Not specified</i>"|safe }}</dd>
 
    </dl>
 
    <p>Send this document to the Chaos Computer Club Lëtzebuerg!</p>
 
    {% if form.payment.data == 'wire transfer' %}
 
      <ul class="bank">
 
        <li>Account Holder: Chaos Computer Club Lëtzebuerg</li>
 
        <li>BIC/Swift: BCEELULLXXX</li>
 
        <li>IBAN: LU29 0019 2855 3890 4000</li>
 
        <li>Message: Membership fee {{ year }} {{ form.username.data }}</li>
 
        <li>Amount: {{ price }}€</li>
 
      </ul>
 
    {% elif form.payment.data == 'cash' %}
 
      <p>Please bring {{ price }}€ with you the next time you meet us!</p>
 
    {% elif form.payment.data == 'bitcoin' %}
 
      <div>
 
          <ul class='btctext'>
 
            <li><b>Address:</b> 3BV5UPToMUmXJiqUVndHjSSq2HqDW8npRd</li>
 
            <li><b>Label:</b> Membership Fee</li>
 
            <li><b>Message:</b> {{ year }} {{ form.username.data }}</li>
 
            <li><b>Amount:</b> {{ price }} BTC</li>
 
         </ul>
 
         {% set bitcoin_url= 'bitcoin:3BV5UPToMUmXJiqUVndHjSSq2HqDW8npRd?amount={amount}&label=Membership Fee {year} {username}&message=Membership Fee {year} {username}'.format(amount=price, year=year, username=form.username.data) %}
 
         <img class='btcqrcode' src="{{ qrcode(bitcoin_url) }}"></img>
 
      </div>
 
    {% elif form.payment.data == 'ethereum' %}
0 comments (0 inline, 0 general)