From: Stas Kravets <skravets@applebough.(none)>
Date: Fri, 18 Feb 2011 16:55:55 +0000 (+0300)
Subject: Merge remote branch 'upstream/master', updating to support latest changes
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cfdcab1233df17c6c91ceb3dbc0dae5d7f5bed70;p=django-social-auth.git

Merge remote branch 'upstream/master', updating to support latest changes

Conflicts:
	example/templates/done.html
	example/templates/home.html
---

cfdcab1233df17c6c91ceb3dbc0dae5d7f5bed70
diff --cc example/templates/done.html
index fa4ff18,4730545..b492cb0
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@@ -56,19 -56,8 +56,19 @@@
          </div>
        </form>
      </li>
 +    <li>
 +      <form action="/login/yandex/" method="post">{% csrf_token %}
 +        <div>
 +          <label for="openid_ya_user">Yandex user
 +            {% if yandex %} <span class="associated">(associated)</span>{% endif %}:
 +          </label>
 +          <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
 +          <input type="submit" value="Login"/>
 +        </div>
 +      </form>
 +    </li>
      <li>
-       <form action="/associate/openid/" method="post">{% csrf_token %}
+       <form action="{% url associate_begin "openid" %}" method="post">{% csrf_token %}
          <div>
            <label for="openid_identifier">Other provider:</label>
            <input id="openid_identifier" type="text" value="" name="openid_identifier" />
diff --cc example/templates/home.html
index 6126124,c040c2c..15652f2
--- a/example/templates/home.html
+++ b/example/templates/home.html
@@@ -27,17 -27,8 +27,17 @@@
          </div>
        </form>
      </li>
 +    <li>
 +      <form action="/login/yandex/" method="post">{% csrf_token %}
 +        <div>
 +          <label for="openid_ya_user">Yandex user:</label>
 +          <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
 +          <input type="submit" value="Login"/>
 +        </div>
 +      </form>
 +    </li>
      <li>
-       <form action="/login/openid/" method="post">{% csrf_token %}
+       <form action="{% url begin "openid" %}" method="post">{% csrf_token %}
          <div>
            <label for="openid_identifier">Other provider</label>
            <input id="openid_identifier" type="text" value="" name="openid_identifier" />