From 51a42534e3989e4ffd0f4be55d22e1f8242aeb54 Mon Sep 17 00:00:00 2001 From: Alex Gibson Date: Wed, 8 May 2013 11:27:15 +0100 Subject: [PATCH] update copy and css styles --- apps/mozorg/forms.py | 4 +- .../contribute_university_ambassadors.html | 86 ++++++++++--------- ...tribute_university_ambassadors_thanks.html | 12 ++- media/css/contribute-ambassadors.less | 37 +++++--- 4 files changed, 82 insertions(+), 57 deletions(-) diff --git a/apps/mozorg/forms.py b/apps/mozorg/forms.py index 78ff0781f85..9559e2136e7 100644 --- a/apps/mozorg/forms.py +++ b/apps/mozorg/forms.py @@ -256,8 +256,8 @@ def __init__(self, *args, **kwargs): def clean(self, *args, **kwargs): super(ContributeUniversityAmbassadorForm, self).clean(*args, **kwargs) - if (self.cleaned_data['current_status'] == 'student' - and not self.cleaned_data['expected_graduation_year']): + if (self.cleaned_data.get('current_status', '') == 'student' + and not self.cleaned_data.get('expected_graduation_year', '')): raise ValidationError(_('Select graduation year')) return self.cleaned_data diff --git a/apps/mozorg/templates/mozorg/contribute_university_ambassadors.html b/apps/mozorg/templates/mozorg/contribute_university_ambassadors.html index d316a9caf24..d35e16f8cbd 100644 --- a/apps/mozorg/templates/mozorg/contribute_university_ambassadors.html +++ b/apps/mozorg/templates/mozorg/contribute_university_ambassadors.html @@ -8,31 +8,35 @@ {% endblock %} {% block content %} +{% block pageheader %}
{{ _('Student Ambassadors') }}

{{ _('Become a member of Firefox Student Ambassadors!') }}

-

{{ _('Show your university why Firefox rocks and encourage others to get involved with Mozilla! Get started by signing up now.') }}

+

{{ _('Show your university why Firefox rocks and encourage others to get involved with Mozilla.') }}

+{% endblock %} {% block billboardcontent %}
{{ csrf() }} -
- {{ form.non_field_errors() }} -

{{ _('Information about You') }}

{{ field_with_attrs(form.first_name, placeholder=_('First name'), required='required')|safe }} + * + {{ form.first_name.errors }}
{{ field_with_attrs(form.last_name, placeholder=_('Last name'), required='required')|safe }} + * + {{ form.last_name.errors }}
{{ field_with_attrs(form.email, placeholder=_('Email'), required='required')|safe }} + * {{ form.email.errors }}
@@ -40,20 +44,29 @@

{{ _('Information about You') }}

{{ _('School Information') }}

{{ field_with_attrs(form.school, placeholder=_('School'), required='required')|safe }} + * + {{ form.school.errors }}
{{ field_with_attrs(form.city, placeholder=_('City'), required='required')|safe }} + * + {{ form.city.errors }}
{{ field_with_attrs(form.country, required='required') }} + * + {{ form.country.errors }}
{{ field_with_attrs(form.current_status, required='required') }} -
* +
{{ field_with_attrs(form.expected_graduation_year)|safe }}
+ {{ form.current_status.errors }} + {{ form.non_field_errors() }}
{{ form.area }} @@ -61,8 +74,28 @@

{{ _('School Information') }}

id="area_free_text"> {{ field_with_attrs(form.area_free_text, placeholder=_('Area of Study')) }}
+ {{ form.area.errors }}
+
+ +
+
+ + {{ form.age_confirmation.errors }} +
+ {{ form.privacy }} + {{ form.privacy.errors }} +
+ {{ form.fmt.label }} {{ form.fmt }} +
@@ -70,9 +103,12 @@

{{ _('School Information') }}

{{ _('Mozilla Communications') }}

{% trans %} - Would you also like to hear about other things that are happening at - Mozilla? You can sign-up to receive additional newsletters based on - your interests: + As part of the Student Ambassadors program, you'll receive an email newsletter from us every month with updates, achievements, Firefox news, and more. + {% endtrans %} +

+

+ {% trans %} + Would you also like to hear about other things that are happening at Mozilla? You can sign-up to receive additional newsletters: {% endtrans %}

@@ -99,43 +135,15 @@

{{ _('Mozilla Communications') }}

{{ form.nl_about_mozilla.label }}
-

- {% trans %} - Great news! After you sign-up for the program you'll be - receiving monthly bulletins from us with updates about the - Firefox Student Ambassador Program. Please look for an email - from us at the beginning of every month with some exciting news - about what is going on that month in the Firefox Student - Ambassador Program! - {% endtrans %} -

-
- -
-
- -
- {{ form.privacy }} -
- {{ form.fmt.label }} {{ form.fmt }} -
{{ form.captcha }} {{ form.captcha.errors }}
+
+ +
-
-
- -
-
{% endblock %} diff --git a/apps/mozorg/templates/mozorg/contribute_university_ambassadors_thanks.html b/apps/mozorg/templates/mozorg/contribute_university_ambassadors_thanks.html index c793ea22ff1..93a0a96f722 100644 --- a/apps/mozorg/templates/mozorg/contribute_university_ambassadors_thanks.html +++ b/apps/mozorg/templates/mozorg/contribute_university_ambassadors_thanks.html @@ -1,9 +1,15 @@ {% extends "mozorg/contribute_university_ambassadors.html" %} +{% block pageheader %} +
+ {{ _('Student Ambassadors') }} +
+{% endblock %} + {% block billboardcontent %}
-

{{_('Thank you for getting in touch.')}}

-

{{_('Someone from Mozilla will get back to you soon with information about how to get involved.')}} +

{{_('Thank you for signing up to be a Firefox Student Ambassador!')}}

+

{{_('Please check your inbox for a confirmation email complete with next steps.')}}

-{% endblock billboardcontent %} +{% endblock billboardcontent %} \ No newline at end of file diff --git a/media/css/contribute-ambassadors.less b/media/css/contribute-ambassadors.less index ec00b3daffe..874d8a27980 100644 --- a/media/css/contribute-ambassadors.less +++ b/media/css/contribute-ambassadors.less @@ -16,25 +16,23 @@ width: 75%; margin: @baseLine auto; } + h2 { + padding-bottom: 10px; + } img { display: block; margin: @baseLine auto; } } -#help-form fieldset { - float: none; - width: 100%; -} - #help-form { + width: auto; h3 { color: @headingColor; } .form-column { position: relative; .span(6); - margin: 0; } .form-column section { margin-bottom: @baseLine; @@ -50,7 +48,7 @@ } .form-submit { .span(2); - float: right; + margin: 0; } .errorlist { padding-bottom: @baseLine / 2; @@ -59,7 +57,7 @@ display:none; } input[type=text] { - width: 90%; + width: 85%; } input[type=submit] { width: (@gridColumnWidth * 2) + (@gridGutterWidth); @@ -70,14 +68,15 @@ } .field-newsletter label, .field-privacy label, + .field-share label, .privacy-check-label { position: relative; - padding-left: 24px; + margin-left: 24px; display: block; input { position: absolute; top: 0; - left: 0; + left: -24px; } } } @@ -90,6 +89,19 @@ margin-top: 0; } +span.required { + padding-left: .1em; + color: #c00; +} + +.field-privacy span:after, +.privacy-check-label span:after { + content: " *"; + color: #c00; +} + + + /* Tablet Layout: 760px */ @media only screen and (min-width: @breakTablet) and (max-width: @breakDesktop) { @@ -97,9 +109,8 @@ .form-column { .span(9); } - .about-you, .school { - .span_narrow(6); - margin: 0; + input[type=text] { + width: 60%; } }