From d8c42b6689c887cb8aa9850fb16d515ea381fb72 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 4 Apr 2013 19:12:35 -0400
Subject: removed the sharing prompt phrase from the question and an extra
 "subscribe" checkbox

---
 askbot/templates/question/content.html               |  2 --
 askbot/templates/question/new_answer_form.html       |  3 ---
 askbot/templates/question/sharing_prompt_phrase.html | 11 -----------
 3 files changed, 16 deletions(-)
 delete mode 100644 askbot/templates/question/sharing_prompt_phrase.html

diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index 467f0217..82185919 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -20,8 +20,6 @@
 
     {{ macros.paginator(paginator_context, anchor='#sort-top') }}
     <div class="clean"></div>
-{% else %}
-    {% include "question/sharing_prompt_phrase.html" %}
 {% endif %}
 
 {# buttons below cannot be cached yet #}
diff --git a/askbot/templates/question/new_answer_form.html b/askbot/templates/question/new_answer_form.html
index f9559c4d..2235f4f4 100644
--- a/askbot/templates/question/new_answer_form.html
+++ b/askbot/templates/question/new_answer_form.html
@@ -3,9 +3,6 @@
         action="{% url answer question.id %}"
         method="post"
         >{% csrf_token %}
-    {# ==== START: question/subscribe_by_email_prompt.html ==== #}
-    {% include "question/subscribe_by_email_prompt.html" %}
-    {# ==== END: question/subscribe_by_email_prompt.html ==== #}
     <div style="clear:both"></div>
     {% if request.user.is_anonymous() and settings.ALLOW_POSTING_BEFORE_LOGGING_IN == False %}
         {% if not thread.closed %}
diff --git a/askbot/templates/question/sharing_prompt_phrase.html b/askbot/templates/question/sharing_prompt_phrase.html
deleted file mode 100644
index 2e68d1f3..00000000
--- a/askbot/templates/question/sharing_prompt_phrase.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% set question_url=(settings.APP_URL|strip_path + question.get_absolute_url())|urlencode %}
-<h2 class="share-question">{% trans %}Know someone who can answer?  Share a <a href="{{ question_url }}">link</a> to this question via{% endtrans %}
-    {% if settings.ENABLE_SHARING_TWITTER %}{{ macros.share(site = 'twitter', site_label = 'Twitter') }},{% endif %}
-    {% if settings.ENABLE_SHARING_FACEBOOK %}{{ macros.share(site = 'facebook', site_label = 'Facebook') }},{% endif %}
-    {% if settings.ENABLE_SHARING_LINKEDIN %}{{ macros.share(site = 'linkedin', site_label = 'LinkedIn') }},{% endif %}
-    {% if settings.ENABLE_SHARING_IDENTICA %}{{ macros.share(site = 'identica', site_label = 'Identi.ca') }},{% endif %}
-    {%- if settings.ENABLE_SHARING_TWITTER or settings.ENABLE_SHARING_FACEBOOK or settings.ENABLE_SHARING_LINKEDIN or settings.ENABLE_SHARING_IDENTICA -%}
-        {% trans %} or{% endtrans %}
-    {% endif %}
-    <a href="mailto:?subject={{ settings.APP_SHORT_NAME|urlencode }}&amp;body={{ question_url }}">{% trans %}email{% endtrans %}</a>.
-</h2>
-- 
cgit v1.2.3-1-g7c22