fix card_multiselect filtering and quantity controls
This commit is contained in:
parent
6e4c6040bd
commit
b97ddde71c
52 changed files with 1689 additions and 2268 deletions
|
|
@ -7,7 +7,7 @@
|
|||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6 text-center">
|
||||
<h1 class="text-3xl font-bold mb-6">{% trans "Account Inactive" %}</h1>
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% trans "This account is inactive." %}
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Verification Code" %}</label>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Verification Code" %}</label>
|
||||
{{ form.code }}
|
||||
{{ form.code.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Sign-In Code" %}</label>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Sign-In Code" %}</label>
|
||||
{{ form.code }}
|
||||
{{ form.code.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Reset Code" %}</label>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Reset Code" %}</label>
|
||||
{{ form.code }}
|
||||
{{ form.code.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium text-gray-700">{% trans "Verification Code" %}</label>
|
||||
<label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Verification Code" %}</label>
|
||||
{{ form.code }}
|
||||
{{ form.code.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<h1 class="text-3xl font-bold text-center mb-6">{% trans "Email Addresses" %}</h1>
|
||||
|
||||
{% if emailaddresses %}
|
||||
<p class="text-gray-700 mb-4">
|
||||
<p class="mb-4">
|
||||
{% trans "The following email addresses are associated with your account:" %}
|
||||
</p>
|
||||
{% url 'account_email' as email_url %}
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<form method="post" action="{{ action_url }}" class="space-y-4">
|
||||
{% csrf_token %}
|
||||
<div>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{{ form.email.label }}</label>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium>{{ form.email.label }}</label>
|
||||
{{ form.email }}
|
||||
{{ form.email.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
{% csrf_token %}
|
||||
{% if current_emailaddress %}
|
||||
<div>
|
||||
<label for="current_email" class="block font-medium text-gray-700">{% trans "Current email" %}:</label>
|
||||
<label for="current_email" class="block font-medium>{% trans "Current email" %}:</label>
|
||||
<input id="current_email" type="email" value="{{ current_emailaddress.email }}" disabled class="input input-bordered w-full">
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if new_emailaddress %}
|
||||
<div>
|
||||
<label for="new_email" class="block font-medium text-gray-700">
|
||||
<label for="new_email" class="block font-medium>
|
||||
{% if not current_emailaddress %}
|
||||
{% trans "Current email" %}:
|
||||
{% else %}
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
<div>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{% trans "Change to" %}:</label>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium>{% trans "Change to" %}:</label>
|
||||
{{ form.email }}
|
||||
{{ form.email.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{% if confirmation %}
|
||||
{% user_display confirmation.email_address.user as user_display %}
|
||||
{% if can_confirm %}
|
||||
<p class="text-gray-700 mb-4">
|
||||
<p class="mb-4">
|
||||
{% blocktrans with confirmation.email_address.email as email %}
|
||||
Please confirm that <a class="text-primary underline" href="mailto:{{ email }}">{{ email }}</a> is an email address for user {{ user_display }}.
|
||||
{% endblocktrans %}
|
||||
|
|
@ -22,13 +22,13 @@
|
|||
<button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% blocktrans %}Unable to confirm {{ confirmation.email_address.email }} because it is already confirmed by a different account.{% endblocktrans %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% url 'account_email' as email_url %}
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% blocktrans %}This email confirmation link expired or is invalid. Please <a class="text-primary underline" href="{{ email_url }}">issue a new email confirmation request</a>.{% endblocktrans %}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.login.id_for_label }}" class="block font-medium text-gray-700">{{ form.login.label }}</label>
|
||||
<label for="{{ form.login.id_for_label }}" class="block font-medium">{{ form.login.label }}</label>
|
||||
{{ form.login }}
|
||||
{{ form.login.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label for="{{ form.password.id_for_label }}" class="block font-medium text-gray-700">{{ form.password.label }}</label>
|
||||
<label for="{{ form.password.id_for_label }}" class="block font-medium">{{ form.password.label }}</label>
|
||||
{{ form.password }}
|
||||
{{ form.password.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{{ form.email.label }}</label>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium>{{ form.email.label }}</label>
|
||||
{{ form.email|add_class:"input input-bordered w-full" }}
|
||||
{{ form.email.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6">
|
||||
<p class="text-gray-700 mb-4">{% trans "Enter your password:" %}</p>
|
||||
<p class="mb-4">{% trans "Enter your password:" %}</p>
|
||||
{% url 'account_reauthenticate' as action_url %}
|
||||
<form method="post" action="{{ action_url }}" class="space-y-4">
|
||||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
{% for field in form %}
|
||||
<div>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
|
||||
{{ field }}
|
||||
{{ field.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6">
|
||||
<h1 class="text-3xl font-bold text-center mb-6">{% trans "Send me a sign-in code" %}</h1>
|
||||
<p class="text-gray-700 mb-4 text-center">
|
||||
<p class="mb-4 text-center">
|
||||
{% trans "You will receive a special code for a password-free sign-in." %}
|
||||
</p>
|
||||
{% url 'account_request_login_code' as login_url %}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
{{ form.non_field_errors }}
|
||||
{% for field in form %}
|
||||
<div>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
|
||||
{{ field }}
|
||||
{{ field.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,27 +10,27 @@
|
|||
{% csrf_token %}
|
||||
{{ form.non_field_errors }}
|
||||
<div>
|
||||
<label for="{{ form.username.id_for_label }}" class="block font-medium text-gray-700">{{ form.username.label }}</label>
|
||||
<label for="{{ form.username.id_for_label }}" class="block font-medium">{{ form.username.label }}</label>
|
||||
{{ form.username }}
|
||||
{{ form.username.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium text-gray-700">{{ form.email.label }}</label>
|
||||
<label for="{{ form.email.id_for_label }}" class="block font-medium">{{ form.email.label }}</label>
|
||||
{{ form.email }}
|
||||
{{ form.email.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label for="{{ form.password1.id_for_label }}" class="block font-medium text-gray-700">{{ form.password1.label }}</label>
|
||||
<label for="{{ form.password1.id_for_label }}" class="block font-medium">{{ form.password1.label }}</label>
|
||||
{{ form.password1 }}
|
||||
{{ form.password1.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label for="{{ form.password2.id_for_label }}" class="block font-medium text-gray-700">{{ form.password2.label }}</label>
|
||||
<label for="{{ form.password2.id_for_label }}" class="block font-medium">{{ form.password2.label }}</label>
|
||||
{{ form.password2 }}
|
||||
{{ form.password2.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label for="{{ form.friend_code.id_for_label }}" class="block font-medium text-gray-700">{{ form.friend_code.label }}</label>
|
||||
<label for="{{ form.friend_code.id_for_label }}" class="block font-medium">{{ form.friend_code.label }}</label>
|
||||
{{ form.friend_code }}
|
||||
{{ form.friend_code.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6">
|
||||
<h1 class="text-3xl font-bold text-center mb-6">{% trans "Passkey Sign Up" %}</h1>
|
||||
<p class="text-gray-700 mb-4 text-center">
|
||||
<p class="mb-4 text-center">
|
||||
{% blocktranslate %}
|
||||
Already have an account? Then please <a href="{{ login_url }}" class="text-primary underline">{% trans "sign in" %}</a>.
|
||||
{% endblocktranslate %}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
{{ form.non_field_errors }}
|
||||
{% for field in form %}
|
||||
<div>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium text-gray-700">{{ field.label }}</label>
|
||||
<label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
|
||||
{{ field }}
|
||||
{{ field.errors }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6 text-center">
|
||||
<h1 class="text-3xl font-bold mb-6">{% trans "Sign Up Closed" %}</h1>
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% trans "We are sorry, but the sign up is currently closed." %}
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{% block content %}
|
||||
<div class="container mx-auto max-w-md mt-6">
|
||||
<h1 class="text-3xl font-bold text-center mb-6">{% trans "Verify Your Email Address" %}</h1>
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
We have sent an email to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification email in your main inbox, check your spam folder. Please contact us if you do not receive the verification email within a few minutes.
|
||||
{% endblocktrans %}
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
<div class="container mx-auto max-w-md mt-6">
|
||||
<h1 class="text-3xl font-bold text-center mb-6">{% trans "Verify Your Email Address" %}</h1>
|
||||
{% url 'account_email' as email_url %}
|
||||
<p class="text-gray-700 mb-4">
|
||||
<p class="mb-4">
|
||||
{% blocktrans %}
|
||||
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 email address.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p class="text-gray-700 mb-4">
|
||||
<p class="mb-4">
|
||||
{% blocktrans %}
|
||||
We have sent an email to you for verification. Please click on the link inside that email. If you do not see the verification email in your main inbox, check your spam folder. Otherwise contact us if you do not receive it within a few minutes.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p class="text-gray-700">
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
<strong>Note:</strong> you can still <a class="text-primary underline" href="{{ email_url }}">change your email address</a>.
|
||||
{% endblocktrans %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue