rename login template dir to account to match the default name django…

…allauth needs #1895
OpenEnergyPlatform · Nov 20, 2024 · 1345570 · 1345570
1 parent 6194224
commit 1345570
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 27 deletions.
diff --git a/...ation/custom_password_reset_complete.html → ...count/custom_password_reset_complete.html b/...ation/custom_password_reset_complete.html → ...count/custom_password_reset_complete.html
diff --git a/...ration/custom_password_reset_confirm.html → ...ccount/custom_password_reset_confirm.html b/...ration/custom_password_reset_confirm.html → ...ccount/custom_password_reset_confirm.html
diff --git a/...istration/custom_password_reset_done.html → ...s/account/custom_password_reset_done.html b/...istration/custom_password_reset_done.html → ...s/account/custom_password_reset_done.html
diff --git a/...istration/custom_password_reset_form.html → ...s/account/custom_password_reset_form.html b/...istration/custom_password_reset_form.html → ...s/account/custom_password_reset_form.html
diff --git a/login/templates/account/login.html b/login/templates/account/login.html
@@ -0,0 +1,59 @@
+{% extends "base/base-full.html" %}
+{% load base_tags %}
+{% load socialaccount %}
+
+
+
+{% load i18n %}
+{% load account socialaccount %}
+
+{% block head_title %}
+  {% translate "Sign In" %}
+{% endblock head_title %}
+
+{% block main-content-body %}
+
+{% block inner %}
+  <h1>{% translate "Sign In" %}</h1>
+  {% get_providers as socialaccount_providers %}
+  {% if socialaccount_providers %}
+    <p>
+      {% translate "Please sign in with one of your existing third party accounts:" %}
+      {% if ACCOUNT_ALLOW_REGISTRATION %}
+        {% blocktranslate trimmed %}
+          Or, <a href="{{ signup_url }}">sign up</a>
+          for a {{ site_name }} account and sign in below:
+        {% endblocktranslate %}
+      {% endif %}
+    </p>
+    <div class="socialaccount_ballot">
+      <ul class="socialaccount_providers">
+        {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+      </ul>
+      <div class="login-or">{% translate "or" %}</div>
+    </div>
+    {% include "socialaccount/snippets/login_extra.html" %}
+  {% else %}
+    {% if ACCOUNT_ALLOW_REGISTRATION %}
+      <p>
+        {% blocktranslate trimmed %}
+          If you have not created an account yet, then please
+          <a href="{{ signup_url }}">sign up</a> first.
+        {% endblocktranslate %}
+      </p>
+    {% endif %}
+  {% endif %}
+  <form class="login" method="post" action="{% url 'account_login' %}">
+    {% csrf_token %}
+    {{ form.as_p }}
+    {% 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' %}">{% translate "Forgot Password?" %}</a>
+    <button class="primaryAction btn btn-primary" type="submit">{% translate "Sign In" %}</button>
+  </form>
+{% endblock inner %}
+{% endblock %}
diff --git a/...es/registration/password_reset_email.html → ...mplates/account/password_reset_email.html b/...es/registration/password_reset_email.html → ...mplates/account/password_reset_email.html
diff --git a/...tes/registration/password_reset_email.txt → ...emplates/account/password_reset_email.txt b/...tes/registration/password_reset_email.txt → ...emplates/account/password_reset_email.txt
diff --git a/login/templates/registration/login.html b/login/templates/registration/login.html