Merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/ubuntu-it-ask into lp:ubuntu-it-ask

[Giuseppe Terrasi]

Unica differenza: ho lasciato yahoo come scriveva WebbIT...

[Riccardo Padovani (rpadovani)]

No Twitter? Non so, la mia è solo una proposta, è che c'è una buona comunità anche su Twitter!

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

Si. twitter e' in elenco e disponibile, ma non configurato, sul sito di prova.

Facendo parte del modulo authauth non e' stato mo dificato e quindi non e' visibile in questo merge che vaa a modificare solo openidauth.

Ricapitolando: fb, twitter, google, yahoo lp e ubuntu SSO

[Riccardo Padovani (rpadovani)]

review: Approve

[lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/ubuntu-it-ask]

23. By root <email address hidden> on 2012-07-05

1) sync with trunk
2) disable oauthauth (twitter) and facebookauth openID authentication

24. By root <email address hidden> on 2012-07-05

close a tag

25. By Giuseppe Terrasi on 2012-07-05

corretto altro errore di distrazione...

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

Sono riuscito a sistemare il tutto. C'erano degli errori... di distrazione.
Scollegandovi e facendo clic su accedi potete vedere il risultato.

review: Needs Resubmitting

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

Provato per alcuni giorni sembra non dare noie. Importo nel trunk principale.

review: Approve

=== added file 'forum/skins/light/media/images/openid/launchpad.png'
Binary files forum/skins/light/media/images/openid/launchpad.png	1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/openid/launchpad.png	2012-07-05 20:47:19 +0000 differ
=== added file 'forum/skins/light/media/images/openid/ubuntusso.png'
Binary files forum/skins/light/media/images/openid/ubuntusso.png	1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/openid/ubuntusso.png	2012-07-05 20:47:19 +0000 differ
=== modified file 'forum/skins/light/templates/auth/signin.html'
--- forum/skins/light/templates/auth/signin.html	2012-07-02 19:36:31 +0000
+++ forum/skins/light/templates/auth/signin.html	2012-07-05 20:47:19 +0000
@@ -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>

=== modified file 'forum_modules/openidauth/authentication.py'
--- forum_modules/openidauth/authentication.py	2012-07-05 20:29:16 +0000
+++ forum_modules/openidauth/authentication.py	2012-07-05 20:47:19 +0000
@@ -12,16 +12,38 @@
     human_name = 'Google'
     icon = '/media/images/openid/google.gif'
 
-#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 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 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.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):
@@ -179,26 +201,4 @@
 #    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''

=== modified file 'settings_local.py'
--- settings_local.py	2012-07-02 19:39:03 +0000
+++ settings_local.py	2012-07-05 20:47:19 +0000
@@ -60,4 +60,4 @@
 OSQA_DEFAULT_SKIN = 'default'
 
 # disable mysqlfulltxt and local authentication (registrations users)
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth']
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth', 'oauthauth', 'facebookauth']