Start switch to Bootstrap 5
- drop jQuery and fontawesome dependencies - add bootstrap5 and bootstrap-icons - update fonts mfizz - update base templates and the first set of other templates - replace blocktrans and trans with blocktranslate and translate to prepare for Django 4 - move hostingpakcage templates to hostingpackages/templates - update translations
This commit is contained in:
parent
5cf7ef7a23
commit
8e42cb9c18
124 changed files with 10873 additions and 4490 deletions
|
|
@ -1,9 +1,9 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ block.super }} - {% trans "Social Network Login Failure" %}{% endblock title %}
|
||||
{% block page_title %}{% trans "Social Network Login Failure" %}{% endblock page_title %}
|
||||
{% block title %}{{ block.super }} - {% translate "Social Network Login Failure" %}{% endblock title %}
|
||||
{% block page_title %}{% translate "Social Network Login Failure" %}{% endblock page_title %}
|
||||
|
||||
{% block content %}
|
||||
<p>{% trans "An error occurred while attempting to login via your social network account." %}</p>
|
||||
{% endblock %}
|
||||
<p>{% translate "An error occurred while attempting to login via your social network account." %}</p>
|
||||
{% endblock %}
|
||||
|
|
@ -1,50 +1,56 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ block.super }} - {% trans "Account Connections" %}{% endblock title %}
|
||||
{% block page_title %}{% trans "Account Connections" %}{% endblock page_title %}
|
||||
{% block title %}{{ block.super }} - {% translate "Account Connections" %}{% endblock title %}
|
||||
{% block page_title %}{% translate "Account Connections" %}{% endblock page_title %}
|
||||
|
||||
{% block content %}
|
||||
{% if form.accounts %}
|
||||
<p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
|
||||
{% if form.accounts %}
|
||||
<p>{% blocktranslate trimmed %}
|
||||
You can sign in to your account using any of the following third party accounts:
|
||||
{% endblocktranslate %}</p>
|
||||
|
||||
<form method="post" action="{% url 'socialaccount_connections' %}">
|
||||
{% csrf_token %}
|
||||
{% if form.non_field_errors %}<div class="text-error">{{form.non_field_errors}}</div>{% endif %}
|
||||
<form method="post" action="{% url 'socialaccount_connections' %}">
|
||||
{% csrf_token %}
|
||||
{% if form.non_field_errors %}
|
||||
<div class="text-error">{{ form.non_field_errors }}</div>{% endif %}
|
||||
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><span class="sr-only">{% trans "Select" %}</span></th>
|
||||
<th>{% trans "Provider" %}</th>
|
||||
<th>{% trans "Account name" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for base_account in form.accounts %}
|
||||
{% with account=base_account.get_provider_account provider=base_account.provider %}
|
||||
<tr>
|
||||
<td><input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/></td>
|
||||
<td><label for="id_account_{{base_account.id}}"><i
|
||||
class="fa fa-{% if provider == 'twitter' %}twitter{% elif provider == 'google' %}google{% elif provider == 'linkedin_oauth2' %}linkedin{% endif %}"></i> <span class="socialaccount_provider {{provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span></label></td>
|
||||
<td>{{ account }}</td>
|
||||
</tr>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<button class="btn btn-warning" type="submit">{% trans 'Remove' %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
|
||||
{% endif %}
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><span class="visually-hidden">{% translate "Select" %}</span></th>
|
||||
<th>{% translate "Provider" %}</th>
|
||||
<th>{% translate "Account name" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for base_account in form.accounts %}
|
||||
{% with account=base_account.get_provider_account provider=base_account.provider %}
|
||||
<tr>
|
||||
<td><input id="id_account_{{ base_account.id }}" type="radio" name="account"
|
||||
value="{{ base_account.id }}"/></td>
|
||||
<td><label for="id_account_{{ base_account.id }}"><i
|
||||
class="{% if provider == 'google' %}bi-google{% elif provider == 'linkedin_oauth2' %}bi-linkedin{% endif %}"></i>
|
||||
<span class="socialaccount_provider {{ provider }} {{ account.get_brand.id }}">{{ account.get_brand.name }}</span></label>
|
||||
</td>
|
||||
<td>{{ account }}</td>
|
||||
</tr>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<button class="btn btn-warning" type="submit">{% translate 'Remove' %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>{% translate 'You currently have no social network accounts connected to this account.' %}</p>
|
||||
{% endif %}
|
||||
|
||||
<h2>{% trans 'Add a 3rd Party Account' %}</h2>
|
||||
<ul class="list-inline">
|
||||
{% include "socialaccount/snippets/provider_list.html" with process="connect" %}
|
||||
</ul>
|
||||
<h2>{% translate 'Add a 3rd Party Account' %}</h2>
|
||||
<ul class="list-inline">
|
||||
{% include "socialaccount/snippets/provider_list.html" with process="connect" %}
|
||||
</ul>
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
{% include "socialaccount/snippets/login_extra.html" %}
|
||||
{% endblock extra_js %}
|
||||
{% include "socialaccount/snippets/login_extra.html" %}
|
||||
{% endblock extra_js %}
|
||||
22
gnuviechadmin/templates/socialaccount/login.html
Normal file
22
gnuviechadmin/templates/socialaccount/login.html
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{% translate "Sign In" %}{% endblock %}
|
||||
{% block page_title %}{% translate "Social Network Sign In" %}{% endblock page_title %}
|
||||
|
||||
{% block content %}
|
||||
{% if process == "connect" %}
|
||||
<h1>{% blocktranslate with provider.name as provider %}Connect {{ provider }}{% endblocktranslate %}</h1>
|
||||
|
||||
<p>{% blocktranslate with provider.name as provider %}You are about to connect a new third party account from {{ provider }}.{% endblocktranslate %}</p>
|
||||
{% else %}
|
||||
<h1>{% blocktranslate with provider.name as provider %}Sign In Via {{ provider }}{% endblocktranslate %}</h1>
|
||||
|
||||
<p>{% blocktranslate with provider.name as provider %}You are about to sign in using a third party account from {{ provider }}.{% endblocktranslate %}</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-primary" type="submit">{% translate "Continue" %}</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -1,10 +1,13 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ block.super }} - {% trans "Login Cancelled" %}{% endblock title %}
|
||||
{% block page_title %}{% trans "Login Cancelled" %}{% endblock page_title %}
|
||||
{% block title %}{{ block.super }} - {% translate "Login Cancelled" %}{% endblock title %}
|
||||
{% block page_title %}{% translate "Login Cancelled" %}{% endblock page_title %}
|
||||
|
||||
{% block content %}
|
||||
{% url 'account_login' as login_url %}
|
||||
<p>{% blocktrans %}You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please proceed to <a href="{{login_url}}">sign in</a>.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
||||
{% url 'account_login' as login_url %}
|
||||
<p>{% blocktranslate trimmed %}
|
||||
You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please
|
||||
proceed to <a href="{{ login_url }}">sign in</a>.
|
||||
{% endblocktranslate %}</p>
|
||||
{% endblock %}
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}The social account has been connected.{% endblocktrans %}
|
||||
{% blocktranslate %}The social account has been connected.{% endblocktranslate %}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}The social account is already connected to a different account.{% endblocktrans %}
|
||||
{% blocktranslate %}The social account is already connected to a different account.{% endblocktranslate %}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
{% load i18n %}
|
||||
{% blocktrans %}The social account has been disconnected.{% endblocktrans %}
|
||||
{% blocktranslate %}The social account has been disconnected.{% endblocktranslate %}
|
||||
|
|
@ -1,17 +1,20 @@
|
|||
{% extends "socialaccount/base.html" %}
|
||||
{% load i18n crispy_forms_tags %}
|
||||
|
||||
{% block title %}{{ block.super }} - {% trans "Signup" %}{% endblock title %}
|
||||
{% block page_title %}{% trans "Sign Up" %}{% endblock page_title %}
|
||||
{% block title %}{{ block.super }} - {% translate "Signup" %}{% endblock title %}
|
||||
{% block page_title %}{% translate "Sign Up" %}{% endblock page_title %}
|
||||
|
||||
{% block content %}
|
||||
<p>{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to
|
||||
{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}</p>
|
||||
<p>{% blocktranslate with provider_name=account.get_provider.name site_name=site.name trimmed %}
|
||||
You are about to use your {{ provider_name }} account to login to {{ site_name }}. As a final step, please
|
||||
complete the following form:
|
||||
{% endblocktranslate %}</p>
|
||||
|
||||
<form class="signup" id="signup_form" method="post" action="{% url 'socialaccount_signup' %}">
|
||||
{% csrf_token %}
|
||||
{{ form | crispy }}
|
||||
{% if redirect_field_value %}<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />{% endif %}
|
||||
<button class="btn btn-primary" type="submit">{% trans "Sign Up" %} »</button>
|
||||
</form>
|
||||
<form class="signup" id="signup_form" method="post" action="{% url 'socialaccount_signup' %}">
|
||||
{% csrf_token %}
|
||||
{{ form | crispy }}
|
||||
{% if redirect_field_value %}
|
||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>{% endif %}
|
||||
<button class="btn btn-primary" type="submit">{% translate "Sign Up" %} »</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<a title="{{ provider.name }}"
|
||||
class="socialaccount_provider {{ provider.id }}"
|
||||
href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><i
|
||||
class="fa fa-{% if provider.id == 'twitter' %}twitter{% elif provider.id == 'google' %}google{% elif provider.id == 'linkedin_oauth2' %}linkedin{% endif %}"></i> {{ provider.name }}
|
||||
class="{% if provider.id == 'google' %}bi-google{% elif provider.id == 'linkedin_oauth2' %}bi-linkedin{% endif %}"></i> {{ provider.name }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue