mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-26 03:24:01 +03:00
Makes template var/tag delimiter spacing consistent
Single space between delimiter matches prescribed Django template style and is consistent with the style those really smart people used in Two Scoops of Django.
This commit is contained in:
parent
37fed6a01b
commit
016e049d07
|
@ -20,9 +20,9 @@
|
||||||
|
|
||||||
{% for emailaddress in user.emailaddress_set.all %}
|
{% for emailaddress in user.emailaddress_set.all %}
|
||||||
<div class="ctrlHolder">
|
<div class="ctrlHolder">
|
||||||
<label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
|
<label for="email_radio_{{ forloop.counter }}" class="{% if emailaddress.primary %}primary_email{% endif %}">
|
||||||
|
|
||||||
<input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
|
<input id="email_radio_{{ forloop.counter }}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{% endif %} value="{{ emailaddress.email }}"/>
|
||||||
|
|
||||||
{{ emailaddress.email }}
|
{{ emailaddress.email }}
|
||||||
{% if emailaddress.verified %}
|
{% if emailaddress.verified %}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
{% user_display confirmation.email_address.user as user_display %}
|
{% user_display confirmation.email_address.user as user_display %}
|
||||||
|
|
||||||
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{email}}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
|
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
|
||||||
|
|
||||||
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
|
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
{% url 'account_email' as email_url %}
|
{% url 'account_email' as email_url %}
|
||||||
|
|
||||||
<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url}}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
|
<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
{% user_display email_address.user as user_display %}
|
{% user_display email_address.user as user_display %}
|
||||||
|
|
||||||
<p>{% blocktrans with email_address.email as email %}You have confirmed that <a href="mailto:{{email}}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
|
<p>{% blocktrans with email_address.email as email %}You have confirmed that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
{% if socialaccount.providers %}
|
{% if socialaccount.providers %}
|
||||||
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
||||||
of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
|
of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
|
||||||
for a {{site_name}} account and sign in below:{% endblocktrans %}</p>
|
for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
|
||||||
|
|
||||||
<div class="socialaccount_ballot">
|
<div class="socialaccount_ballot">
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<form method="post" action="{% url 'account_logout' %}">
|
<form method="post" action="{% url 'account_logout' %}">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% if redirect_field_value %}
|
{% if redirect_field_value %}
|
||||||
<input type="hidden" name="{{redirect_field_name}}" value="{{redirect_field_value}}"/>
|
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
|
<button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<h2>{% trans "Verify Your E-mail Address" %}</h2>
|
<h2>{% trans "Verify Your E-mail Address" %}</h2>
|
||||||
|
|
||||||
<p>{% blocktrans %}We have sent an e-mail to <a href="mailto:{{email}}">{{ email }}</a> for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
<p>{% blocktrans %}We have sent an e-mail to <a href="mailto:{{ email }}">{{ email }}</a> for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
verification. Please click on the link inside this e-mail. Please
|
verification. Please click on the link inside this e-mail. Please
|
||||||
contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
||||||
|
|
||||||
<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{email_url}}">change your e-mail address</a>.{% endblocktrans %}</p>
|
<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user