small changes to the bugfix branch

2 files changed, 15 insertions, 11 deletions

diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index dce91566..ae003ef4 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -305,7 +305,12 @@
         <a href="mailto:?subject={{ settings.APP_SHORT_NAME|urlencode }}&amp;body={{ question_url }}">{% trans %}email{% endtrans %}</a>.
     </h2>
 {% endif %}
-<form id="fmanswer" action="{% url answer question.id %}" method="post">{% csrf_token %}
+<form 
+    id="fmanswer"
+    {% if user == question.author %}style="display:none"{% endif %}
+    action="{% url answer question.id %}"
+    method="post"
+>{% csrf_token %}
     {% if request.user.is_authenticated() %}
         <p style="padding-left:3px">
         {{ answer.email_notify }} 
@@ -539,12 +544,11 @@
             }
             {% if settings.ENABLE_SHARING_GOOGLE %}$.getScript("http://apis.google.com/js/plusone.js"){% endif %}
 
-            {% if request.user == question.author%}
-            $("#fmanswer").hide();
-            $("#fmanswer_button").click(function() {
-                $("#fmanswer").show();
-                $("#fmanswer_button").hide();
-            });
+            {% if request.user == question.author %}
+                $("#fmanswer_button").click(function() {
+                    $("#fmanswer").show();
+                    $("#fmanswer_button").hide();
+                });
             {%endif%}
         });
         
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 3c9a7686..1d7d02dd 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -10,25 +10,25 @@
             id="sort_reputation"
             href="{% url users %}?sort=reputation"
             {% if tab_id == 'reputation' %}class="on"{% endif %}
-            title="{% trans %}People sorted by reputation{% endtrans %}"
+            title="{% trans %}see people with the highest reputation{% endtrans %}"
         ><span>{% trans %}reputation{% endtrans %}</span></a>
         <a 
             id="sort_newest"
             href="{% url users %}?sort=newest"
             {% if tab_id == 'newest' %}class="on"{% endif %}
-            class="off" title="{% trans %}People sorted by join newer date{% endtrans %}"
+            class="off" title="{% trans %}see people who joined most recently{% endtrans %}"
         ><span>{% trans %}recent{% endtrans %}</span></a>
         <a 
             id="sort_last"
             href="{% url users %}?sort=last"
             {% if tab_id == 'last' %}class="on"{% endif %}
-            class="off" title="{% trans %}People sorted by oldest join date{% endtrans %}"
+            class="off" title="{% trans %}see people who joined the site first{% endtrans %}"
         ><span>{% trans %}oldest{% endtrans %}<span></a>
         <a 
             id="sort_user"
             href="{% url users %}?sort=user"
             {% if tab_id == 'user' %}class="on"{% endif %}
-            title="{% trans %}People sorted by username{% endtrans %}"
+            title="{% trans %}see people sorted by name{% endtrans %}"
         ><span>{% trans %}by username{% endtrans %}</span></a>
     </div>
 </div>