Skip to content

[bug 920456] Fix and refactor mobile get involved signups. #1651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rlr wants to merge 1 commit into from
Closed

[bug 920456] Fix and refactor mobile get involved signups. #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions kitsune/landings/templates/landings/mobile/get-involved-aoa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ <h4>{{ _('Pick a way to get involved') }}</h4>
</a>
</li>
</ul>
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
</div>

{% include 'landings/mobile/includes/register_contributor.html' %}

{% endblock %}
9 changes: 3 additions & 6 deletions kitsune/landings/templates/landings/mobile/get-involved-kb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ <h4>{{ _('Pick a way to get involved') }}</h4>
</a>
</li>
</ul>
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
</div>

{% include 'landings/mobile/includes/register_contributor.html' %}

{% endblock %}
9 changes: 3 additions & 6 deletions kitsune/landings/templates/landings/mobile/get-involved-l10n.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ <h4>{{ _('Pick a way to get involved') }}</h4>
</a>
</li>
</ul>
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
</div>

{% include 'landings/mobile/includes/register_contributor.html' %}

{% endblock %}
9 changes: 3 additions & 6 deletions kitsune/landings/templates/landings/mobile/get-involved-questions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ <h4>{{ _('Pick a way to get involved') }}</h4>
</a>
</li>
</ul>
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
</div>

{% include 'landings/mobile/includes/register_contributor.html' %}

{% endblock %}
19 changes: 3 additions & 16 deletions kitsune/landings/templates/landings/mobile/get-involved.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,7 @@ <h4>{{ _('Pick a way to get involved') }}</h4>
</a>
</li>
</ul>
{% if not user.is_authenticated() or not user.groups.filter(name='Registered as contributor') %}
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
{% if user.is_authenticated() %}
<form method="post" action="{{ url('users.make_contributor') }}">
<input type="hidden" name="return_to" value="{{ url('landings.get_involved') }}">
{{ csrf() }}
<button class="btn btn-submit">{{ _('Sign me up') }}</button>
</form>
{% else %}
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
{% endif %}
</div>
{% endif %}

{% include 'landings/mobile/includes/register_contributor.html' %}

{% endblock %}
24 changes: 24 additions & 0 deletions kitsune/landings/templates/landings/mobile/includes/register_contributor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% if not user.is_authenticated() or not user.groups.filter(name='Registered as contributor') %}
<div class="sign-up">
<h3>{{ _('Sign up as a volunteer') }}</h3>
{% if user.is_authenticated() %}
<form method="post" action="{{ url('users.make_contributor') }}">
<input type="hidden" name="return_to" value="{{ url('landings.get_involved') }}">
{{ csrf() }}
<button class="btn btn-submit">{{ _('Sign me up') }}</button>
</form>
{% else %}
{% if waffle.flag('browserid') %}
<form id="gi-browserid-form" action="{{ url('users.browserid_verify') }}" method="post">
<input type="hidden" name="contributor" value="1">
{{ browserid_form }}
</form>
<a class="btn btn-submit browserid-login" data-form="gi-browserid-form" data-next="{{ request.get_full_path() }}" href="#">{{ _('Sign me up') }}</a>
{% else %}
<a class="btn btn-submit" href="{{ url('users.auth_contributor') }}">
{{ _('Sign me up') }}
</a>
{% endif %}
{% endif %}
</div>
{% endif %}