mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-09-21 03:19:07 +03:00
Fix the templates so they don't blow up cookiecutter
This commit is contained in:
Daniel Greenfeld
parent
d47f30c9fc
commit
a6a4f2272d
|
|
@ -1,4 +1,3 @@
|
|||
{% extends "base.html" %}
|
||||
{% raw %}{% extends "base.html" %}
|
||||
{% block title %}{% block head_title %}{% endblock head_title %}{% endblock title %}
|
||||
|
||||
|
||||
{% endraw %}
|
||||
|
|
@ -1,58 +1,62 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Account" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "E-mail Addresses" %}</h1>
|
||||
{% if user.emailaddress_set.all %}
|
||||
<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
|
||||
|
||||
<form action="{% url 'account_email' %}" class="email_list" method="post">
|
||||
{% csrf_token %}
|
||||
<fieldset class="blockLabels">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "E-mail Addresses" %}</h2>
|
||||
{% if user.emailaddress_set.all %}
|
||||
<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
|
||||
|
||||
<form action="{% url 'account_email' %}" class="email_list" method="post">
|
||||
{% csrf_token %}
|
||||
<fieldset class="blockLabels">
|
||||
|
||||
{% for emailaddress in user.emailaddress_set.all %}
|
||||
<div class="ctrlHolder">
|
||||
<label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
|
||||
{% for emailaddress in user.emailaddress_set.all %}
|
||||
<div class="ctrlHolder">
|
||||
<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 }}
|
||||
{% if emailaddress.verified %}
|
||||
<span class="verified">{% trans "Verified" %}</span>
|
||||
{% else %}
|
||||
<span class="unverified">{% trans "Unverified" %}</span>
|
||||
{% endif %}
|
||||
{% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
|
||||
</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{{ emailaddress.email }}
|
||||
{% if emailaddress.verified %}
|
||||
<span class="verified">{% trans "Verified" %}</span>
|
||||
{% else %}
|
||||
<span class="unverified">{% trans "Unverified" %}</span>
|
||||
{% endif %}
|
||||
{% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
|
||||
</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="buttonHolder">
|
||||
<button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
|
||||
<button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
|
||||
<button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
|
||||
</div>
|
||||
<div class="buttonHolder">
|
||||
<button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
|
||||
<button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
|
||||
<button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</form>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
{% else %}
|
||||
<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
|
||||
{% else %}
|
||||
<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
<h2>{% trans "Add E-mail Address" %}</h2>
|
||||
|
||||
<form method="post" action="" class="add_email uniForm">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p}}
|
||||
<button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
|
||||
</form>
|
||||
<h2>{% trans "Add E-mail Address" %}</h2>
|
||||
|
||||
<form method="post" action="" class="add_email">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button class="btn" name="action_add" type="submit">{% trans "Add E-mail" %}</button>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -72,3 +76,4 @@
|
|||
})();
|
||||
</script>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with current_site.name as site_name %}User {{ user_display }} at {{ site_name }} has given this as an email address.
|
||||
|
||||
To confirm this is correct, go to {{ activate_url }}
|
||||
{% endblocktrans %}{% endautoescape %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% include "account/email/email_confirmation_message.txt" %}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{% include "account/email/email_confirmation_subject.txt" %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% autoescape off %}
|
||||
{% blocktrans %}Confirm E-mail Address{% endblocktrans %}
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{% load i18n %}{% blocktrans with site.domain as site_domain and user.username as username %}You're receiving this e-mail because you or someone else has requested a password for your user account at {{site_domain}}.
|
||||
It can be safely ignored if you did not request a password reset. Click the link below to reset your password.
|
||||
|
||||
{{password_reset_url}}
|
||||
|
||||
In case you forgot, your username is {{username}}.
|
||||
|
||||
Thanks for using our site!
|
||||
{% endblocktrans %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% autoescape off %}
|
||||
{% blocktrans %}Password Reset E-mail{% endblocktrans %}
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
||||
|
||||
{% if confirmation %}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
|
||||
{% csrf_token %}
|
||||
<button type="submit">{% trans 'Confirm' %}</button>
|
||||
<button class="submit" type="submit">{% trans 'Confirm' %}</button>
|
||||
</form>
|
||||
|
||||
{% else %}
|
||||
|
|
@ -35,3 +35,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
|
@ -7,11 +7,16 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
||||
|
||||
<h1>{% trans "Confirm E-mail Address" %}</h1>
|
||||
|
||||
{% 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>
|
||||
|
||||
{% 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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
|
@ -47,4 +47,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -26,3 +26,4 @@
|
|||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}You cannot remove your primary e-mail address ({{email}}).{% endblocktrans %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Confirmation e-mail sent to {{email}}.{% endblocktrans %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Removed e-mail address {{email}}.{% endblocktrans %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{% load account %}
|
||||
{% load i18n %}
|
||||
{% user_display user as name %}
|
||||
{% blocktrans %}Successfully signed in as {{name}}.{% endblocktrans %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}You have signed out.{% endblocktrans %}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Password successfully changed.{% endblocktrans %}
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Password successfully set.{% endblocktrans %}
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Primary e-mail address set.{% endblocktrans %}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}Your primary e-mail address must be verified.{% endblocktrans %}
|
||||
|
|
@ -1,20 +1,22 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load cripsy_forms_tags %}
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h1>{% trans "Change Password" %}</h1>
|
||||
<h2>{% trans "Change Password" %}</h2>
|
||||
|
||||
<form method="POST" action="" class="password_change">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<button type="submit" name="action">{% trans "Change Password" %}</button>
|
||||
{{ form|crispy }}
|
||||
<button class="btn" type="submit" name="action">{% trans "Change Password" %}</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,14 +1,15 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Delete Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Delete Password" %}</h1>
|
||||
<h2>{% trans "Delete Password" %}</h2>
|
||||
<p>{% blocktrans %}You may delete your password since you are currently logged in using OpenID.{% endblocktrans %}</p>
|
||||
<form method="post" action="">
|
||||
{% csrf_token %}
|
||||
<input type="submit" value="{% trans "delete my password" %}">
|
||||
<button class="btn" type="submit">{% trans "delete my password" %}</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Password Deleted" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Password Deleted" %}</h1>
|
||||
<h2>{% trans "Password Deleted" %}</h2>
|
||||
<p>{% blocktrans %}Your password has been deleted.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
|
||||
<h1>{% trans "Password Reset" %}</h1>
|
||||
<h2>{% trans "Password Reset" %}</h2>
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
|
@ -35,3 +35,4 @@
|
|||
$("#id_email").focus();
|
||||
</script>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
|
@ -6,11 +6,18 @@
|
|||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Password Reset" %}</h1>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
<p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2>{% trans "Password Reset" %}</h2>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
<p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,24 +1,33 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
{% load cripsy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h2>
|
||||
|
||||
{% if token_fail %}
|
||||
{% url 'account_reset_password' as passwd_reset_url %}
|
||||
<p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
|
||||
{% else %}
|
||||
{% if form %}
|
||||
<form method="POST" action="" class="uniForm">
|
||||
<form method="POST" action="">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" name="action" value="{% trans "change password" %}"/>
|
||||
{{ form|crispy }}
|
||||
<button type="submit" name="action">{% trans "change password" %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>{% trans 'Your password is now changed.' %}</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -14,3 +14,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
{% raw %}
|
||||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n crispy_forms_tags %}
|
||||
|
|
@ -19,3 +20,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -24,3 +24,4 @@
|
|||
{% endblock content %}
|
||||
|
||||
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -16,5 +16,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% endraw %}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
||||
{% user_display user as user_display %}
|
||||
<p><strong>{% trans "Note" %}:</strong> {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}</p>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
|
|
@ -16,3 +16,4 @@
|
|||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "account/base.html" %}
|
||||
{% raw %}{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
|
@ -26,3 +26,4 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endraw %}
|
||||
|
|
@ -1 +1 @@
|
|||
{% extend "base.html" %}
|
||||
{% raw %}{% extend "base.html" %}{% endraw %}
|
||||
|
|
@ -1 +1 @@
|
|||
{% extend "base.html" %}
|
||||
{% raw %}{% extend "base.html" %}{% endraw %}
|
||||
Loading…
Reference in New Issue
Block a user