improved wording of the ask and edit question page

6 files changed, 24 insertions, 21 deletions

diff --git a/askbot/templates/ask.html b/askbot/templates/ask.html
index 831b3a91..030780f6 100644
--- a/askbot/templates/ask.html
+++ b/askbot/templates/ask.html
@@ -22,7 +22,7 @@
                 {% else %}
                     {% if settings.EMAIL_VALIDATION %}
                         {% if not request.user.email_isvalid %}
-                        <li class="warning">{% trans email=request.user.email %}YYour email, %(email)s has not yet been validated. To post messages you must verify your email, please see <a href='%(email_validation_faq_url)s'>more details here</a>. You can submit your question now and validate email after that. Meanwhile, your question will saved as pending.{% endtrans %}</li>
+                        <li class="warning">{% trans email=request.user.email %}Your email, %(email)s has not yet been validated. To post messages you must verify your email, please see <a href='%(email_validation_faq_url)s'>more details here</a>. You can submit your question now and validate email after that. Meanwhile, your question will saved as pending.{% endtrans %}</li>
                         {% endif %}
                     {% endif %}
                 {% endif %}
diff --git a/askbot/templates/embed/ask_by_widget.html b/askbot/templates/embed/ask_by_widget.html
index dae9f598..5060301c 100644
--- a/askbot/templates/embed/ask_by_widget.html
+++ b/askbot/templates/embed/ask_by_widget.html
@@ -167,7 +167,7 @@
 <div class="title">{{widget.title}}</div>
 <form action="." method="POST" accept-charset="utf-8">
   {% csrf_token %}
-  <label>{%trans%}Please enter a descriptive title for your question{%endtrans%}</label>
+  <label>{%trans%}Please enter your question{%endtrans%}</label>
   <div class="input-title">
     {{form.title}}
   </div>
diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html
index 6fd69647..9088618c 100644
--- a/askbot/templates/macros.html
+++ b/askbot/templates/macros.html
@@ -544,7 +544,6 @@ for the purposes of the AJAX comment editor #}
                 post_type = None,
                 post_html = None,
                 mandatory_tags = None,
-                edit_title = False,
                 use_category_selector = False,
                 tag_names = None,
                 editor_type = None,
diff --git a/askbot/templates/question_edit.html b/askbot/templates/question_edit.html
index 1aaa972c..ee979fb8 100644
--- a/askbot/templates/question_edit.html
+++ b/askbot/templates/question_edit.html
@@ -16,13 +16,22 @@
                                         name="select_revision" 
                                         value="false">
     </div> 
+    <div class="form-item">
+        <label for="id_title" >
+            {% trans %}Question - in one sentence{% endtrans %}
+            {% if form.title.errors %}
+                {{ form.title.errors }}
+            {% endif %}
+        </label>
+        {{ form.title }}
+    </div>
+    <label for="editor">{% trans %}Details{% endtrans %}</label>
     {% set use_category_selector = (settings.TAG_SOURCE == 'category-tree') %}
     {{
         macros.edit_post(
                     form,
                     post_type = 'question',
                     post_html = revision.text,
-                    edit_title = True,
                     mandatory_tags = mandatory_tags,
                     use_category_selector = use_category_selector,
                     tag_names = tag_names,
diff --git a/askbot/templates/widgets/ask_form.html b/askbot/templates/widgets/ask_form.html
index 53b93158..e26ec771 100644
--- a/askbot/templates/widgets/ask_form.html
+++ b/askbot/templates/widgets/ask_form.html
@@ -1,20 +1,26 @@
 {% import "macros.html" as macros %}
 <form id="fmask" action="" method="post" >{% csrf_token %}
     <div class="form-item ask-form-bar">
+        <label for="id_title">
+            {{ form.title.help_text }}
+            {% if form.title.errors %}
+                <span class="form-error">{{ form.title.errors }}</span>
+            {% endif %}
+        </label>
         <div id="askFormBar">
             <input id="id_title" class="questionTitleInput" name="title" autocomplete="off"
                 value="{% if form.initial.title %}{{form.initial.title|escape}}{% endif %}"/>
-            <span class="form-error">{{ form.title.errors }}</span>
-        </div>
-        <div class="title-desc">
-            {{ form.title.help_text }}
         </div>
     </div>
+    {% if settings.MIN_QUESTION_BODY_LENGTH == 0 %}
+        <label for="editor">{% trans %}Add details{% endtrans %}</label>
+    {% else %}
+        <label for="editor">{% trans %}Add details, if necessary{% endtrans %}</label>
+    {% endif %}
     {{
         macros.edit_post(
             form,
             post_type = 'question',
-            edit_title = False,
             mandatory_tags = mandatory_tags,
             use_category_selector = (settings.TAG_SOURCE == 'category-tree'),
             editor_type = settings.EDITOR_TYPE,
diff --git a/askbot/templates/widgets/edit_post.html b/askbot/templates/widgets/edit_post.html
index 9e9a3761..ad01cc68 100644
--- a/askbot/templates/widgets/edit_post.html
+++ b/askbot/templates/widgets/edit_post.html
@@ -1,12 +1,3 @@
-{% if edit_title %}
-    <div class="form-item">
-        <label for="id_title" ><strong>{{ post_form.title.label_tag() }}:</strong></label> <span class="form-error"></span><br/>
-        {{ post_form.title }} {{ post_form.title.errors }}
-        <div class="title-desc">
-            {{ post_form.title.help_text }}
-        </div>
-    </div>
-{% endif %}
 {% if editor_type == 'markdown' %}
     <div class="wmd-container">
         <div id="wmd-button-bar" class="wmd-panel"></div>
@@ -57,9 +48,7 @@
             {% endif %}
             <span class="form-error">{{ post_form.tags.errors }}</span><br/>
             {{ post_form.tags }}
-            <div class="title-desc">
-                {{ post_form.tags.help_text }}
-            </div>
+            <br/><label for="id_tags">{{ post_form.tags.help_text }}</label>
         {% endif %}
     </div>
 {% endif %}