Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-10 00:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged with R4stl1n master

Browse Source 
Had to resolve a small conflict in email. Replaced mine with upstream.
This commit is contained in:
Brett Costabile
2015-11-05 22:37:37 -05:00
parent c4069de4c5 b5133a55e8
commit 15e959b265
32 changed files with 374 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/registration/password_reset_complete.html
View File

@@ -12,7 +12,11 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
{% if IS_CORP %}
<title>{{ CORP_NAME }} - Login</title>
{% else %}
<title>{{ ALLIANCE_NAME }} - Login</title>
{% endif %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

7
templates/registration/password_reset_confirm.html
View File

@@ -12,8 +12,11 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
{% if IS_CORP %}
<title>{{ CORP_NAME }} - Login</title>
{% else %}
<title>{{ ALLIANCE_NAME }} - Login</title>
{% endif %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom Fonts -->

2
templates/registration/password_reset_done.html
View File

@@ -12,7 +12,7 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
<title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

6
templates/registration/password_reset_email.html
View File

@@ -4,12 +4,12 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
https://evesugar.dyndns.info{% url 'password_reset_confirm' uidb64=uid token=token %}
https://someurl.com{% url 'password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
{% trans "Thanks for using our site!" %}
{% blocktrans %}SUGAR Aliiance Team{% endblocktrans %}
{% blocktrans %}Your Corporation{% endblocktrans %}
{% endautoescape %}
{% endautoescape %}

6
templates/registration/password_reset_form.html
View File

@@ -12,7 +12,11 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
{% if IS_CORP %}
<title>{{ CORP_NAME }} - Login</title>
{% else %}
<title>{{ ALLIANCE_NAME }} - Login</title>
{% endif %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">