Adding login providers settings

3 files changed, 173 insertions, 22 deletions

diff --git a/askbot/conf/__init__.py b/askbot/conf/__init__.py
index 29a967c9..05818b44 100644
--- a/askbot/conf/__init__.py
+++ b/askbot/conf/__init__.py
@@ -13,6 +13,7 @@ import askbot.conf.user_settings
 import askbot.conf.markup
 import askbot.conf.social_sharing
 import askbot.conf.badges
+import askbot.conf.login_providers
 
 #import main settings object
 from askbot.conf.settings_wrapper import settings
diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py
new file mode 100644
index 00000000..f00af3a1
--- /dev/null
+++ b/askbot/conf/login_providers.py
@@ -0,0 +1,141 @@
+"""
+External service key settings
+"""
+from askbot.conf.settings_wrapper import settings
+from askbot.deps import livesettings
+from django.utils.translation import ugettext as _
+from django.conf import settings as django_settings
+
+LOGIN_PROVIDERS = livesettings.ConfigurationGroup(
+                    'LOGIN_PROVIDERS',
+                    _('External login providers configuration.')
+                )
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'twitter',
+        description=_('Activate Twitter')
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'google',
+        description=_('Activate Google'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'linkedin',
+        description=_('Activate LinkedIn'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'yahoo',
+        description=_('Activate Yahoo'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'aol',
+        description=_('Activate AOL'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'openid',
+        description=_('Activate OpenID'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'facebook',
+        description=_('Activate Facebook'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'local',
+        description=_('Activate Local Login'),
+    )
+)
+#Minor providers
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'flickr',
+        description=_('Activate Flickr'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'technorati',
+        description=_('Activate Technorati'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'wordpress',
+        description=_('Activate Wordpress'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'blogger',
+        description=_('Activate Blogger'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'livejournal',
+        description=_('Activate LiveJournal'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'claimid',
+        description=_('Activate Claimid'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'vidoop',
+        description=_('Activate Vidoop'),
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'verisign',
+        description=_('Activate Verisign'),
+    )
+)
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html
index ed985882..be8d1dfd 100644
--- a/askbot/skins/default/templates/authopenid/signin.html
+++ b/askbot/skins/default/templates/authopenid/signin.html
@@ -49,20 +49,24 @@
         <div id="login-icons">

             <ul class="login-icons large">

                 {% for login_provider in major_login_providers %}

-                <li>

-                    <input

-                        name="{{login_provider.name}}"

-                        type="image"

-                        class="{{login_provider.type}}"

-                        src="{{login_provider.icon_media_path|media}}"

-                        alt="{{login_provider.tooltip_text}}"

-                        title="{{login_provider.tooltip_text}}"

-                    />

-                </li>

+                

+                {%if settings[login_provider.name] == True%}

+                  <li>

+                      <input

+                          name="{{login_provider.name}}"

+                          type="image"

+                          class="{{login_provider.type}}"

+                          src="{{login_provider.icon_media_path|media}}"

+                          alt="{{login_provider.tooltip_text}}"

+                          title="{{login_provider.tooltip_text}}"

+                      />

+                  </li>

+                {%endif%}

                 {% endfor %}

             </ul>

             <ul class="login-icons small">

                 {% for login_provider in minor_login_providers %}

+                {%if settings[login_provider.name] == True%}

                 <li>

                     <input

                         name="{{login_provider.name}}"

@@ -73,6 +77,7 @@
                         title="{{login_provider.tooltip_text}}"

                     />

                 </li>

+                {%endif%}

                 {% endfor %}

             </ul>

         </div>

@@ -250,21 +255,25 @@
         var siteName = '{{settings.APP_SHORT_NAME}}';

         var provider_count = {{existing_login_methods|length}};

         {% for login_provider in major_login_providers %}

-            {% if login_provider.extra_token_name %}

-                extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

-            {% endif %}

-            {% if login_provider.type == 'password' %}

-                create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

-                change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+            {%if settings[login_provider.name] == True%}

+              {% if login_provider.extra_token_name %}

+                  extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

+              {% endif %}

+              {% if login_provider.type == 'password' %}

+                  create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

+                  change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+              {% endif %}

             {% endif %}

         {% endfor %}

         {% for login_provider in minor_login_providers %}

-            {% if login_provider.extra_token_name %}

-                extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

-            {% endif %}

-            {% if login_provider.type == 'password' %}

-                create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

-                change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+            {%if settings[login_provider.name] == True%}

+              {% if login_provider.extra_token_name %}

+                  extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

+              {% endif %}

+              {% if login_provider.type == 'password' %}

+                  create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

+                  change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+              {% endif %}

             {% endif %}

         {% endfor %}

         {% if user.is_authenticated() %}