Commit c84c52e7 authored by Michal Čihař's avatar Michal Čihař

Merge all authentication into one profile tab

parent 042af570
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
<li><a href="#preferences">{% trans "Preferences" %}</a></li> <li><a href="#preferences">{% trans "Preferences" %}</a></li>
<li><a href="#subscriptions">{% trans "Subscriptions" %}</a></li> <li><a href="#subscriptions">{% trans "Subscriptions" %}</a></li>
<li><a href="#account">{% trans "Account" %}</a></li> <li><a href="#account">{% trans "Account" %}</a></li>
<li><a href="#password">{% trans "Password" %}</a></li> <li><a href="#auth">{% trans "Authentification" %}</a></li>
<li><a href="#identities">{% trans "Identities" %}</a></li>
<li><a href="#info">{% trans "Information" %}</a></li> <li><a href="#info">{% trans "Information" %}</a></li>
<li><a href="#licenses">{% trans "Licenses" %}</a></li> <li><a href="#licenses">{% trans "Licenses" %}</a></li>
<li><a href="#avatar">{% trans "Avatar" %}</a></li> <li><a href="#avatar">{% trans "Avatar" %}</a></li>
...@@ -45,11 +44,10 @@ ...@@ -45,11 +44,10 @@
</table> </table>
<span class="helptext">{% trans "Your name and email will appear as author on Git commits." %}</span> <span class="helptext">{% trans "Your name and email will appear as author on Git commits." %}</span>
</div> </div>
<div id="password"> <div id="auth">
{% url 'django.contrib.auth.views.password_change' as pw_url %} {% url 'django.contrib.auth.views.password_change' as pw_url %}
{% blocktrans %}You can change password on <a href="{{ pw_url }}">separate page</a>.{% endblocktrans %} {% blocktrans %}You can change password on <a href="{{ pw_url }}">separate page</a>.{% endblocktrans %}
</div>
<div id="identities">
<p>{% trans "You can manage third party services which are associated to this account." %}</p> <p>{% trans "You can manage third party services which are associated to this account." %}</p>
<p>{% trans "Currently associated:" %}</p> <p>{% trans "Currently associated:" %}</p>
<ul> <ul>
......
...@@ -168,6 +168,7 @@ TEMPLATE_LOADERS = ( ...@@ -168,6 +168,7 @@ TEMPLATE_LOADERS = (
# Authentication configuration # Authentication configuration
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
'social.backends.google.GoogleOpenId', 'social.backends.google.GoogleOpenId',
'social.backends.email.EmailAuth',
#'social.backends.github.GithubOAuth2', #'social.backends.github.GithubOAuth2',
#'social.backends.suse.OpenSUSEOpenId', #'social.backends.suse.OpenSUSEOpenId',
'accounts.auth.AnonymousUserBackend', 'accounts.auth.AnonymousUserBackend',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment