summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/conf/social_sharing.py7
-rw-r--r--askbot/templates/user_profile/user_info.html8
2 files changed, 12 insertions, 3 deletions
diff --git a/askbot/conf/social_sharing.py b/askbot/conf/social_sharing.py
index e57dec28..392fa042 100644
--- a/askbot/conf/social_sharing.py
+++ b/askbot/conf/social_sharing.py
@@ -35,7 +35,12 @@ settings.register(
SOCIAL_SHARING,
'ENABLE_SHARING_TWITTER',
default=True,
- description=_('Check to enable sharing of questions on Twitter')
+ description=_('Check to enable sharing of questions on Twitter'),
+ help_text=_(
+ 'Important - to actually start sharing on twitter, '
+ 'it is required to set up Twitter consumer key and secret '
+ 'in the "keys to external services" section.'
+ )
)
)
diff --git a/askbot/templates/user_profile/user_info.html b/askbot/templates/user_profile/user_info.html
index 8f7a5006..95baad20 100644
--- a/askbot/templates/user_profile/user_info.html
+++ b/askbot/templates/user_profile/user_info.html
@@ -88,8 +88,12 @@
<td>{{ macros.user_website_link(view_user, max_display_length = 30) }}</td>
</tr>
{% endif %}
- {% if request.user == view_user and settings.ENABLE_SHARING_TWITTER %}
- {% include "user_profile/twitter_sharing_controls.html" %}
+ {% if request.user == view_user and
+ settings.TWITTER_SECRET and
+ settings.TWITTER_KEY and
+ settings.ENABLE_SHARING_TWITTER
+ %}
+ {% include "user_profile/twitter_sharing_controls.html" %}
{% endif %}
{% if view_user.location or view_user.country %}
<tr>