Rm unused i18n tags
Nikos Roussos
parent
3fa79dd03a
commit
ac6af8671a
|
|
@ -1,19 +1,18 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Account" %}{% endblock %}
|
||||
{% block head_title %}Account{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "E-mail Addresses" %}</h2>
|
||||
<h2>E-mail Addresses</h2>
|
||||
{% if user.emailaddress_set.all %}
|
||||
<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
|
||||
|
||||
<p>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">
|
||||
|
|
@ -26,36 +25,36 @@
|
|||
|
||||
{{ emailaddress.email }}
|
||||
{% if emailaddress.verified %}
|
||||
<span class="verified">{% trans "Verified" %}</span>
|
||||
<span class="verified">Verified</span>
|
||||
{% else %}
|
||||
<span class="unverified">{% trans "Unverified" %}</span>
|
||||
<span class="unverified">Unverified</span>
|
||||
{% endif %}
|
||||
{% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
|
||||
{% if emailaddress.primary %}<span class="primary">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>
|
||||
<button class="secondaryAction" type="submit" name="action_primary" >Make Primary</button>
|
||||
<button class="secondaryAction" type="submit" name="action_send" >{Re-send Verification</button>
|
||||
<button class="primaryAction" type="submit" name="action_remove" >Remove</button>
|
||||
</div>
|
||||
|
||||
</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>Warning:</strong> 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 %}
|
||||
|
||||
|
||||
<h2>{% trans "Add E-mail Address" %}</h2>
|
||||
|
||||
<h2>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>
|
||||
<button class="btn" name="action_add" type="submit">Add E-mail</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -66,7 +65,7 @@
|
|||
{% block extra_body %}
|
||||
<script type="text/javascript">
|
||||
(function() {
|
||||
var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
|
||||
var message = "Do you really want to remove the selected e-mail address?";
|
||||
var actions = document.getElementsByName('action_remove');
|
||||
if (actions.length) {
|
||||
actions[0].addEventListener("click", function(e) {
|
||||
|
|
|
|||
|
|
@ -1,34 +1,33 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
||||
{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
|
||||
{% block head_title %}Confirm E-mail Address{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
||||
<h2>Confirm E-mail Address</h2>
|
||||
|
||||
{% if confirmation %}
|
||||
|
||||
{% 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>Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.</p>
|
||||
|
||||
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
|
||||
{% csrf_token %}
|
||||
<button class="submit" type="submit">{% trans 'Confirm' %}</button>
|
||||
<button class="submit" type="submit">Confirm</button>
|
||||
</form>
|
||||
|
||||
{% else %}
|
||||
|
||||
{% 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>This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.</p>
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
||||
{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
|
||||
{% block head_title %}Confirm E-mail Address{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
||||
<h2>Confirm E-mail Address</h2>
|
||||
|
||||
{% 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>You have confirmed that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Sign In" %}{% endblock %}
|
||||
{% block head_title Sign In{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
|
|
@ -13,12 +12,12 @@
|
|||
<div class="col-md-5">
|
||||
|
||||
|
||||
<h2>{% trans "Sign In" %}</h2>
|
||||
<h2>Sign In</h2>
|
||||
|
||||
{% if socialaccount.providers %}
|
||||
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
||||
<p>Please sign in with one
|
||||
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:</p>
|
||||
|
||||
<div class="socialaccount_ballot">
|
||||
|
||||
|
|
@ -26,7 +25,7 @@
|
|||
{% include "socialaccount/snippets/provider_list.html" with process="login" %}
|
||||
</ul>
|
||||
|
||||
<div class="login-or">{% trans 'or' %}</div>
|
||||
<div class="login-or">or</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -40,8 +39,8 @@
|
|||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
||||
{% endif %}
|
||||
<a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
|
||||
<button class="btn btn-primary" type="submit">{% trans "Sign In" %}</button>
|
||||
<a class="button secondaryAction" href="{% url 'account_reset_password' %}">Forgot Password?"</a>
|
||||
<button class="btn btn-primary" type="submit">"Sign In"</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,24 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Sign Out" %}{% endblock %}
|
||||
{% block head_title %}Sign Out{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
|
||||
<h2>{% trans "Sign Out" %}</h2>
|
||||
<h2>Sign Out</h2>
|
||||
|
||||
<p>{% trans 'Are you sure you want to sign out?' %}</p>
|
||||
<p>Are you sure you want to sign out?</p>
|
||||
|
||||
<form method="post" action="{% url 'account_logout' %}">
|
||||
{% csrf_token %}
|
||||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
|
||||
{% endif %}
|
||||
<button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
|
||||
<button class="btn btn-danger" type="submit">Sign Out</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load crispy_forms_tags %}
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
{% block head_title %}Change Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Change Password" %}</h2>
|
||||
<h2>Change Password</h2>
|
||||
|
||||
<form method="POST" action="./" class="password_change">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button class="btn" type="submit" name="action">{% trans "Change Password" %}</button>
|
||||
<button class="btn" type="submit" name="action">Change Password</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Delete Password" %}{% endblock %}
|
||||
{% block head_title %}Delete Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{% trans "Delete Password" %}</h2>
|
||||
<p>{% blocktrans %}You may delete your password since you are currently logged in using OpenID.{% endblocktrans %}</p>
|
||||
<h2>Delete Password</h2>
|
||||
<p>You may delete your password since you are currently logged in using OpenID.</p>
|
||||
<form method="post" action="./">
|
||||
{% csrf_token %}
|
||||
<button class="btn" type="submit">{% trans "delete my password" %}</button>
|
||||
<button class="btn" type="submit">delete my password</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Password Deleted" %}{% endblock %}
|
||||
{% block head_title %}Password Deleted{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{% trans "Password Deleted" %}</h2>
|
||||
<p>{% blocktrans %}Your password has been deleted.{% endblocktrans %}</p>
|
||||
<h2>Password Deleted</h2>
|
||||
<p>Your password has been deleted.</p>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,29 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
||||
{% block head_title %}Password Reset{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
|
||||
<h2>{% trans "Password Reset" %}</h2>
|
||||
<h2>Password Reset</h2>
|
||||
{% if user.is_authenticated %}
|
||||
{% include "account/snippets/already_logged_in.html" %}
|
||||
{% endif %}
|
||||
|
||||
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
|
||||
<p>Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."</p>
|
||||
|
||||
<form method="POST" action="./" class="password_reset">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button class="btn" type="submit">{% trans "Reset My Password" %}</button>
|
||||
<button class="btn" type="submit">Reset My Password</button>
|
||||
</form>
|
||||
|
||||
<p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
|
||||
<p>Please contact us if you have any trouble resetting your password.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
|
||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
||||
{% block head_title %}Password Reset{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Password Reset" %}</h2>
|
||||
|
||||
<h2>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>
|
||||
|
||||
<p>We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,28 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
{% block head_title %}Change Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h2>
|
||||
<h2>{% if token_fail %}Bad Token{% else %}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>
|
||||
<p>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>.</p>
|
||||
{% else %}
|
||||
{% if form %}
|
||||
<form method="POST" action="./">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<button type="submit" name="action">{% trans "change password" %}</button>
|
||||
<button type="submit" name="action">change password</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>{% trans 'Your password is now changed.' %}</p>
|
||||
<p>Your password is now changed.</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
||||
{% block head_title %}Change Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Change Password" %}</h2>
|
||||
<p>{% trans 'Your password is now changed.' %}</p>
|
||||
<h2>Change Password</h2>
|
||||
<p>Your password is now changed.'</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
|
||||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n crispy_forms_tags %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %}{% trans "Set Password" %}{% endblock %}
|
||||
{% block head_title %}Set Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Set Password" %}</h2>
|
||||
<h2>Set Password</h2>
|
||||
|
||||
<form method="POST" action="./" class="password_set">
|
||||
{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
<input type="submit" name="action" value="{% trans "Set Password" %}"/>
|
||||
<input type="submit" name="action" value="Set Password"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block title %}{% trans "Signup" %}{% endblock title %}
|
||||
{% block title %}Sign Up{% endblock title %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Sign Up" %}</h1>
|
||||
<h1>Sign Up</h1>
|
||||
|
||||
<p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
|
||||
<p>Already have an account? Then please <a href="{{ login_url }}">sign in</a>.</p>
|
||||
|
||||
<form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
|
||||
{% csrf_token %}
|
||||
|
|
@ -17,7 +16,7 @@
|
|||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
||||
{% endif %}
|
||||
<button class="btn" type="submit">{% trans "Sign Up" %} »</button>
|
||||
<button class="btn" type="submit">Sign Up »</button>
|
||||
</form>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
|
||||
{% block head_title %}Sign Up Closed{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Sign Up Closed" %}</h2>
|
||||
<h2>Sign Up Closed</h2>
|
||||
|
||||
<p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
|
||||
<p>We are sorry, but the sign up is currently closed.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
|
||||
{% block head_title %}Verify Your E-mail Address{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<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>
|
||||
</div>
|
||||
<h2>Verify Your E-mail Address</h2>
|
||||
|
||||
<p>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.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,26 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
|
||||
{% block head_title %}Verify Your E-mail Address{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Verify Your E-mail Address" %}</h2>
|
||||
<h2>Verify Your E-mail Address</h2>
|
||||
|
||||
{% url 'account_email' as email_url %}
|
||||
|
||||
<p>{% blocktrans %}This part of the site requires us to verify that
|
||||
<p>This part of the site requires us to verify that
|
||||
you are who you claim to be. For this purpose, we require that you
|
||||
verify ownership of your e-mail address. {% endblocktrans %}</p>
|
||||
verify ownership of your e-mail address.</p>
|
||||
|
||||
<p>{% blocktrans %}We have sent an e-mail to you for
|
||||
<p>We have sent an e-mail to you for
|
||||
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.</p>
|
||||
|
||||
<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
|
||||
<p><strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
|
||||
{% extends "avatar/base.html" %}
|
||||
{% load i18n avatar_tags %}
|
||||
{% load avatar_tags %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Your current avatar: " %}</h2>
|
||||
<h2>Your current avatar:</h2>
|
||||
{% avatar user %}
|
||||
{% if not avatars %}
|
||||
<p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
|
||||
<p>You haven't uploaded an avatar yet. Please upload one now.</p>
|
||||
{% endif %}
|
||||
<form enctype="multipart/form-data" method="POST" action="{% url 'avatar_add' %}">
|
||||
{{ upload_avatar_form.as_p }}
|
||||
<p>{% csrf_token %}<input type="submit" value="{% trans "Upload New Image" %}" /></p>
|
||||
<p>{% csrf_token %}<input type="submit" value="Upload New Image" /></p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
{% extends "avatar/base.html" %}
|
||||
{% load i18n avatar_tags %}
|
||||
{% load avatar_tags %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Your current avatar: " %}</h2>
|
||||
<h2>Your current avatar:</h2>
|
||||
{% avatar user %}
|
||||
{% if not avatars %}
|
||||
<p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
|
||||
<p>You haven't uploaded an avatar yet. Please upload one now.</p>
|
||||
{% else %}
|
||||
<form method="POST" action="{% url 'avatar_change' %}">
|
||||
<ul>
|
||||
{{ primary_avatar_form.as_ul }}
|
||||
</ul>
|
||||
<p>{% csrf_token %}<input type="submit" value="{% trans "Choose new Default" %}" /></p>
|
||||
<p>{% csrf_token %}<input type="submit" value="Choose new Default" /></p>
|
||||
</form>
|
||||
{% endif %}
|
||||
<form enctype="multipart/form-data" method="POST" action="{% url 'avatar_add' %}">
|
||||
{{ upload_avatar_form.as_p }}
|
||||
<p>{% csrf_token %}<input type="submit" value="{% trans "Upload New Image" %}" /></p>
|
||||
<p>{% csrf_token %}<input type="submit" value="Upload New Image" /></p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{% extends "avatar/base.html" %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h2>{% trans "Please select the avatars that you would like to delete." %}</h2>
|
||||
<h2>Please select the avatars that you would like to delete.</h2>
|
||||
{% if not avatars %}
|
||||
{% url 'avatar_change' as avatar_change_url %}
|
||||
<p>{% blocktrans %}You have no avatars to delete. Please <a href="{{ avatar_change_url }}">upload one</a> now.{% endblocktrans %}</p>
|
||||
<p>You have no avatars to delete. Please <a href="{{ avatar_change_url }}">upload one</a> now.</p>
|
||||
{% else %}
|
||||
<form method="POST" action="{% url 'avatar_delete' %}">
|
||||
<ul>
|
||||
{{ delete_avatar_form.as_ul }}
|
||||
</ul>
|
||||
<p>{% csrf_token %}<input type="submit" value="{% trans "Delete These" %}" /></p>
|
||||
<p>{% csrf_token %}<input type="submit" value="Delete These" /></p>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -69,12 +69,12 @@
|
|||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="{% url 'users:view_user' username=request.user.username %}">My Profile</a></li>
|
||||
<li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
|
||||
<li><a href="{% url 'account_logout' %}">Logout</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% else %}
|
||||
<li><a href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
|
||||
<li><a href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
|
||||
<li><a href="{% url 'account_signup' %}">Sign Up</a></li>
|
||||
<li><a href="{% url 'account_login' %}">Log In</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% load staticfiles i18n %}
|
||||
{% load staticfiles %}
|
||||
{% load tags %}
|
||||
|
||||
{% block title %}Home{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{% extends "base.html" %}
|
||||
{% load tags %}
|
||||
|
||||
{% load staticfiles i18n %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Observation {{ observation.id }}{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "base.html" %}
|
||||
{% load static %}{% load i18n %}
|
||||
{% load static %}
|
||||
{% load avatar_tags %}
|
||||
|
||||
{% block title %}Members{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue