From: Stas Kravets <krvss@mail.ru>
Date: Tue, 16 Aug 2011 14:14:43 +0000 (+0400)
Subject: Merge remote-tracking branch 'upstream/master'.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=108292071ae10d06913025da052a1459f06b1879;p=django-social-auth.git

Merge remote-tracking branch 'upstream/master'.
---

108292071ae10d06913025da052a1459f06b1879
diff --cc example/app/views.py
index 11d2b38,c104662..d44546d
--- a/example/app/views.py
+++ b/example/app/views.py
@@@ -6,8 -6,8 +6,7 @@@ from django.template import RequestCont
  from django.shortcuts import render_to_response
  
  from social_auth import __version__ as version
- from social_auth.backends import BACKENDS, OpenIdAuth, BaseOAuth, BaseOAuth2
  
 -
  def home(request):
      """Home view, displays login mechanism"""
      if request.user.is_authenticated():
diff --cc example/templates/done.html
index a6e27c1,6b12fd9..04b7b94
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@@ -59,27 -58,21 +58,32 @@@
            <input type="submit" value="Login"/>
          </div>
        </form>
-     </li>
-     <li>
+       {% else %}
+         {% if name == "openid" %}
 +      <form action="{% url socialauth_associate_begin "yandex" %}" method="post">{% csrf_token %}
 +        <div>
 +          <label for="openid_ya_user">Yandex user
 +            {% if yandex %}(<span class="disconnect"><a href="{% url disconnect "yandex" %}">disconnect</a>)</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="{% url socialauth_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" />
-           <input type="submit" />
-         </div>
-       </form>
+         <form action="{% url socialauth_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" />
+             <input type="submit" value="Login" />
+           </div>
+           <p class="helptext">Like your personal <a href="https://www.myopenid.com/" title="My OpenId">myopenid</a></p>
+         </form>
+         {% endif %}
+       {% endif %}
+     {% endif %}
      </li>
+   {% endfor %}
    </ul>
  </div>
  
diff --cc example/templates/home.html
index 5d3717e,1a39af4..c1abd7a
--- a/example/templates/home.html
+++ b/example/templates/home.html
@@@ -39,34 -37,21 +37,28 @@@
            <input type="submit" value="Login"/>
          </div>
        </form>
+       {% else %}
+         {% if name == "openid" %}
+         <form action="{% url socialauth_begin "openid" %}" method="post">{% csrf_token %}
+           <div>
+             <label for="openid_identifier">Other provider</label>
+             <input id="openid_identifier" type="text" value="" name="openid_identifier" />
+             <input type="submit" value="Login" />
+           </div>
+           <p class="helptext">Like your personal <a href="https://www.myopenid.com/" title="My OpenId">myopenid</a></p>
+         </form>
+         {% endif %}
+       {% endif %}
+     {% endif %}
      </li>
-     <li>
-       <form action="{% url socialauth_begin "yandex" %}" method="post">{% csrf_token %}
-         <div>
-           <label for="openid_ya_user">Yandex user(optional):</label>
-           <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
-           <input type="submit" value="Login"/>
-         </div>
-       </form>
-     </li>
- 	<li><a rel="nofollow" href="{% url socialauth_begin "socialauth_begin" %}">Yandex OpenID 2.0</a></li>
-     <li>
-     <form action="{% url socialauth_begin "openid" %}" method="post">{% csrf_token %}
-         <div>
-           <label for="openid_identifier">Other provider</label>
-           <input id="openid_identifier" type="text" value="" name="openid_identifier" />
-           <input type="submit" value="Login" />
-         </div>
-         <p class="helptext">Like your personal <a href="https://www.myopenid.com/" title="My OpenId">myopenid</a></p>
-       </form>
-     </li>
+   {% endfor %}
    </ul>
  </div>
 +
 +<div>
 +  <h3>Login using other authentication systems:</h3>
 +  	<ul>
 +  		<li><a rel="nofollow" href="{% url socialauth_begin "vkontakte" %}">VKontakte OpenAPI</a></li>
 +	</ul>
 +</div>
  {% endblock %}