apply changes in according to bug #1020685

forum/skins/light/templates/auth/signin.html

@@ -99,13 +99,13 @@
             <input type="hidden" class="validate_email" name="validate_email" value="yes" />
         </form>
     {% endfor %}
-    <h3 class="or_label">{% trans 'Or...' %}</h3>
+    <!-- <h3 class="or_label">{% trans 'Or...' %}</h3>
     <form name="signin_form" id="dummy_form_unused" class="signin_form" method="POST" action="">
         {% csrf_token %}
         <fieldset>
             {% trans 'Click' %} <a href="{% url auth_request_tempsignin %}">{% trans 'here' %}</a> {% trans "if you're having trouble signing in." %}
         </fieldset>
-    </form>
+    </form> -->
     <script type="text/html" id="simple_form_template">
         <fieldset id="slot_form">
               <p id="provider_name_slot">{% trans 'Enter your ' %}%%YOUR_WHAT%%</p>

forum_modules/openidauth/authentication.py

@@ -12,16 +12,38 @@ class GoogleAuthContext(ConsumerTemplateContext):
     human_name = 'Google'
     icon = '/media/images/openid/google.gif'
 
-#class YahooAuthConsumer(OpenIdAbstractAuthConsumer):
-#    def get_user_url(self, request):
-#        return 'http://yahoo.com/'
+class YahooAuthConsumer(OpenIdAbstractAuthConsumer):
+    def get_user_url(self, request):
+        return 'http://yahoo.com/'
 
-#class YahooAuthContext(ConsumerTemplateContext):
-#    mode = 'BIGICON'
-#    type = 'DIRECT'
-#    weight = 300
-#    human_name = 'Yahoo'
-#    icon = '/media/images/openid/yahoo.gif'
+class YahooAuthContext(ConsumerTemplateContext):
+    mode = 'BIGICON'
+    type = 'DIRECT'
+    weight = 300
+    human_name = 'Yahoo'
+    icon = '/media/images/openid/yahoo.gif'
+
+class LaunchpadAuthConsumer(OpenIdAbstractAuthConsumer):
+    def get_user_url(self, request):
+        return 'https://login.launchpad.net'
+
+class LaunchpadAuthConsumer(ConsumerTemplateContext):
+    mode = 'BIGICON'
+    type = 'DIRECT'
+    weight = 200
+    human_name = 'Launchpad OpenID'
+    icon = '/media/images/openid/launchpad.png'
+
+class UbuntuSSOAuthConsumer(OpenIdAbstractAuthConsumer):
+    def get_user_url(self, request):
+        return 'https://login.ubuntu.com'
+
+class UbuntuSSOAuthContext(ConsumerTemplateContext):
+    mode = 'BIGICON'
+    type = 'DIRECT'
+    weight = 200
+    human_name = 'Ubuntu Single Sign On'
+    icon = '/media/images/openid/ubuntusso.png
 
 #class AolAuthConsumer(OpenIdAbstractAuthConsumer):
 #    def get_user_url(self, request):
@@ -95,7 +117,7 @@ class GoogleAuthContext(ConsumerTemplateContext):
 
 #    def get_user_url(self, request):
 #        blog_name = request.POST['input_field']
-        return "http://%s.wordpress.com/" % blog_name
+#        return "http://%s.wordpress.com/" % blog_name
 
 #class WordpressAuthContext(ConsumerTemplateContext):
 #    mode = 'SMALLICON'
@@ -179,26 +201,4 @@ class GoogleAuthContext(ConsumerTemplateContext):
 #    weight = 300
 #    human_name = 'OpenId url'
 #    stack_item_template = 'modules/openidauth/openidurl.html'
-#    icon = '/media/images/openid/openid-inputicon.gif'
-
-class LaunchpadAuthConsumer(OpenIdAbstractAuthConsumer):
-    def get_user_url(self, request):
-        return 'https://login.launchpad.net'
-
-class LaunchpadAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
-    type = 'DIRECT'
-    weight = 200
-    human_name = 'Launchpad OpenID'
-    icon = '/media/images/openid/launchpad.gif'
-
-class UbuntuSSOAuthConsumer(OpenIdAbstractAuthConsumer):
-    def get_user_url(self, request):
-        return 'https://login.ubuntu.com'
-
-class UbuntuSSOAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
-    type = 'DIRECT'
-    weight = 200
-    human_name = 'Ubuntu Single Sign On'
-    icon = '/media/images/openid/ubuntusso.gif'
+#    icon = '/media/images/openid/openid-inputicon.gif''