escape the base path when building the pagination URLs

[osqa.git] / forum / skins / default / templates / auth / auth_settings.html

diff --git a/forum/skins/default/templates/auth/auth_settings.html b/forum/skins/default/templates/auth/auth_settings.html
index e19a10cc1c7d3e1eee100825185d2114595c0feb..8b52019b2b24b80bce1487be226f70b277eaca68 100644 (file)
--- a/forum/skins/default/templates/auth/auth_settings.html
+++ b/forum/skins/default/templates/auth/auth_settings.html
@@ -1,10 +1,10 @@
-{% extends "base.html" %}
+{% extends "user.html" %}

 <!-- changepw.html -->
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Authentication settings" %}{% endspaceless %}{% endblock %}
 <!-- changepw.html -->
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Authentication settings" %}{% endspaceless %}{% endblock %}

-{% block content %}
-<div class="headNormal">{% trans "Authentication settings" %}</div>
+{% block usercontent %}
+<h2>{% trans "Authentication settings" %}</h2>

 {% if auth_keys %}
     <p class="message">{% blocktrans %}These are the external authentication providers currently associated with your account.{% endblocktrans %}</p>
     <div>
 {% if auth_keys %}
     <p class="message">{% blocktrans %}These are the external authentication providers currently associated with your account.{% endblocktrans %}</p>
     <div>


@@ -16,13 +16,13 @@
 {% if not auth_keys %}
     <p class="message">{% blocktrans %}You currently have no external authentication provider associated with your account.{% endblocktrans %}</p>
 {% endif %}
 {% if not auth_keys %}
     <p class="message">{% blocktrans %}You currently have no external authentication provider associated with your account.{% endblocktrans %}</p>
 {% endif %}

-{% ifequal user request.user %}
+{% ifequal view_user request.user %}

     <input type="button" class="submit" value="{% trans "Add new provider" %}" onclick="window.location='{% url user_add_external_provider %}'" />
 {% endifequal %}
     <input type="button" class="submit" value="{% trans "Add new provider" %}" onclick="window.location='{% url user_add_external_provider %}'" />
 {% endifequal %}

+{% if allow_local_auth %}

 {% if has_password %}
     <p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
 {% if has_password %}
     <p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>

-{% endif %}
-{% if not has_password %}
+{% else %}

     <p class="message">{% blocktrans %}You can set up a password for your account, so you can login using standard username and password!{% endblocktrans %}</p>
 {% endif %}
 <div class="aligned">
     <p class="message">{% blocktrans %}You can set up a password for your account, so you can login using standard username and password!{% endblocktrans %}</p>
 {% endif %}
 <div class="aligned">


@@ -33,5 +33,6 @@
         <div class="submit-row"><input type="submit" class="submit" value="{% if has_password %}{% trans "Change password" %}{% endif %}{% if not has_password %}{% trans "Create password" %}{% endif %}" /></div>
        </form>
        </div>
         <div class="submit-row"><input type="submit" class="submit" value="{% if has_password %}{% trans "Change password" %}{% endif %}{% if not has_password %}{% trans "Create password" %}{% endif %}" /></div>
        </form>
        </div>

+{% endif %}

 {% endblock %}
 <!-- end changepw.html -->
 {% endblock %}
 <!-- end changepw.html -->