diff --git a/askbot/media/wmd/askbot_converter.js b/askbot/media/wmd/askbot_converter.js index 0e3689f049..a0a1d1c1e1 100644 --- a/askbot/media/wmd/askbot_converter.js +++ b/askbot/media/wmd/askbot_converter.js @@ -19,7 +19,7 @@ AskbotMarkdownConverter.prototype.scheduleMathJaxRendering = function () { clearTimeout(this._timeout); } var renderFunc = function () { - MathJax.Hub.Queue(['Typeset', MathJax.Hub, 'previewer']); + MathJax.Hub.Queue(['Typeset', MathJax.Hub, 'previewer-2']); }; this._timeout = setTimeout(renderFunc, 500); }; diff --git a/askbot/templates/user_profile/user_info.html b/askbot/templates/user_profile/user_info.html index eeef08a25b..2c3d33d20b 100644 --- a/askbot/templates/user_profile/user_info.html +++ b/askbot/templates/user_profile/user_info.html @@ -10,7 +10,7 @@
{{ macros.gravatar(view_user, 128) }} {% if request.user.pk == view_user.pk %} -

{% endif %} - + {% endif %} @@ -120,10 +120,10 @@

{{ view_user.get_status_display() }}

}} {% endif %} - {% if request.user == view_user and - settings.TWITTER_SECRET and - settings.TWITTER_KEY and - settings.ENABLE_SHARING_TWITTER + {% 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 %} @@ -149,7 +149,7 @@

{{ view_user.get_status_display() }}

{% if show_profile_info %} - {% set editable=(request.user.is_authenticated() + {% set editable=(request.user.is_authenticated() and ( (request.user == view_user) or request.user.is_admin_or_mod() ) @@ -165,15 +165,15 @@

{{ view_user.get_status_display() }}

data-editor-type="{{ settings.EDITOR_TYPE }}" data-previewer-enabled="false" > - {% with view_user.get_localized_profile().about as user_about %} -
{{ user_about|convert_text }}
- {% endwith %} + +
{{ view_user.get_localized_profile().about|convert_text }}
+
{% else %} - {{ view_user.about|convert_text }} + {{ view_user.get_localized_profile().about|convert_text }} {% endif %} {% endif %}