merged with the tag-editor branch

4 files changed, 56 insertions, 30 deletions

diff --git a/askbot/skins/default/templates/help.html b/askbot/skins/default/templates/help.html
index 204fc086..6fdecd51 100644
--- a/askbot/skins/default/templates/help.html
+++ b/askbot/skins/default/templates/help.html
@@ -12,6 +12,8 @@
 <p>
     {% trans %}Thank you for using {{app_name}}, here is how it works.{% endtrans %}
 </p>
+<a name="content"></a>
+<h2>{% trans %}How questions, answers and comments work{% endtrans %}</h2>
 <p>
     {% trans %}This site is for asking and answering questions, not for open-ended discussions.{% endtrans %}
     {% trans %}We encourage everyone to use “question” space for asking and “answer” for answering.{% endtrans %}
@@ -20,13 +22,35 @@
     {% trans %}Despite that, each question and answer can be commented – 
     the comments are good for the limited discussions.{% endtrans %}
 </p>
+<a name="search"></a>
+<h2>{% trans %}Please search before asking your questions{% endtrans %}</h2>
+<p>{% trans %}Type your question in the search bar and see whether a similar question has been asked before{% endtrans %}.
+</p>
+<p>{% trans %}Search has advanced capabilities:{% endtrans %}</p>
+<ul>
+    <li>{% trans %}to search in title - enter [title: your text]{% endtrans %}</li>
+    <li>{% trans %}to search by tags - enter [tag: sometag] or #sometag{% endtrans %}</li>
+    <li>{% trans %}to search by user - enter [user: somename] or @somename or @"some name"{% endtrans %}</li>
+</ul>
+<p>{% trans %}In addition, it is possible to click on tags to add them to the search query.{% endtrans %}
+{% if settings.TAG_SEARCH_INPUT_ENABLED %}
+    {% trans %}Finally, a separate tag search box is available in the side bar of the main page, where the search tags can be entered as well{% endtrans %}
+{% endif %}
+</p>
+<p>{% trans %}<em>Important!!!</em> All search terms are combined with a logical "AND" expression - to narrow the search by adding new terms.{% endtrans %}</p>
+<a name="voting"></a>
+<h2>{% trans %}Voting{% endtrans %}</h2>
 <p>
     {% trans %}Voting in {{app_name}} helps to select best answers and thank most helpful users.{% endtrans %}
 </p>
+<p>
     {% trans %}Please vote when you find helpful information,
     it really helps the {{app_name}} community.{% endtrans %}
-     
-    {% trans %}Besides, you can @mention users anywhere in the text to point their attention,
+</p>
+<a name="other"></a>
+<h2>{% trans %}Other topics{% endtrans %}</h2>
+<p>
+    {% trans %}You can @mention users anywhere in the text to point their attention,
     follow users and conversations and report inappropriate content by flagging it.{% endtrans %}
 </p>
 <p>{% trans %}Enjoy.{% endtrans %}</p>
diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html
index 10f8ede2..f1e0fb44 100644
--- a/askbot/skins/default/templates/main_page/javascript.html
+++ b/askbot/skins/default/templates/main_page/javascript.html
@@ -1,4 +1,5 @@
 <script type="text/javascript">
+    /*<![CDATA[*/
     var sortMethod = '{{sort}}';
     var showSortByRelevance = {% if show_sort_by_relevance %}true{% else %}false{% endif %};
     var minSearchWordLength = {{settings.MIN_SEARCH_WORD_LENGTH}};
@@ -22,6 +23,26 @@
     askbot['urls']['set_tag_filter_strategy'] = '{% url "set_tag_filter_strategy" %}';
     askbot['urls']['questions'] = '{% url "questions" %}';
     askbot['urls']['question_url_template'] = scriptUrl + '{{'question/'|transurl}}{{ "{{QuestionID}}/" }}';
+
+    if (Modernizr.history) {
+        // history management works!
+    } else {
+        // no history support :(
+        //hash = unescape(window.location.hash).replace('#','').split("?")[0]
+        {# todo: fix this evil code!!! #}
+        var hash = History.unescapeHash(window.location.hash).replace('#','').split("?")[0];
+        var questions_url = askbot['urls']['questions'];
+        if (hash.substring(0, questions_url.length) === questions_url) {
+            var url = hash;
+        } else {
+            var url = questions_url + hash;
+        }
+        if (hash !== '' && hash !== undefined && url !== undefined){
+            {# was this causing strange redirects in IE??? #}
+            window.location = 'http://' + window.location.host + url;
+        }
+    }
+    /*]]>*/
 </script>
 <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
 {% if request.user.is_authenticated() %}
diff --git a/askbot/skins/default/templates/main_page/tag_search.html b/askbot/skins/default/templates/main_page/tag_search.html
index 45f12b2f..0d81bf4e 100644
--- a/askbot/skins/default/templates/main_page/tag_search.html
+++ b/askbot/skins/default/templates/main_page/tag_search.html
@@ -1,5 +1,6 @@
 <div id="tagSearch" class="box">
     <h2>{% trans %}Tag search{% endtrans %}</h2>
+    <label for="ab-tag-search">{% trans %}Please note that tag search is case sensitive!{% endtrans %}</label>
     <div class="inputs">
         <input id="ab-tag-search" autocomplete="off" type="text"/>
         <input id="ab-tag-search-add" type="submit" value="{% trans %}search{% endtrans %}"/>
diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
index 09970468..b3fcd815 100644
--- a/askbot/skins/default/templates/meta/bottom_scripts.html
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -3,15 +3,15 @@
    main template "base.html"
 #}
 <div id="no-javascript">
-  <noscript class="noscript">
-    {% trans app_name = settings.APP_SHORT_NAME %}Please note: {{app_name}} requires javascript to work properly, please enable javascript in your browser, <a href="{{noscript_url}}">here is how</a>{% endtrans %}
-  </noscript>
-  <script type="text/javascript">
+    <noscript class="noscript">
+        {% trans app_name = settings.APP_SHORT_NAME %}Please note: {{app_name}} requires javascript to work properly, please enable javascript in your browser, <a href="{{noscript_url}}">here is how</a>{% endtrans %}
+    </noscript>
+    <script type="text/javascript">
         //IE fix to hide the red margin
-  	var noscript = document.getElementsByTagName('noscript')[0];
-	noscript.style.padding = '0px';
-	noscript.style.backgroundColor = 'transparent';
-  </script>
+        var noscript = document.getElementsByTagName('noscript')[0];
+        noscript.style.padding = '0px';
+        noscript.style.backgroundColor = 'transparent';
+    </script>
 </div>
 <script type="text/javascript">
     var i18nLang = '{{settings.LANGUAGE_CODE}}';
@@ -51,26 +51,6 @@
 <script type="text/javascript">
     /*<![CDATA[*/
     $(document).ready(function(){
-        {% if active_tab == 'questions' %}
-            if (Modernizr.history) {
-                // history management works!
-            } else {
-                // no history support :(
-                //hash = unescape(window.location.hash).replace('#','').split("?")[0]
-                {# todo: fix this evil code!!! #}
-                var hash = History.unescapeHash(window.location.hash).replace('#','').split("?")[0];
-                var questions_url = askbot['urls']['questions'];
-                if (hash.substring(0, questions_url.length) === questions_url) {
-                    var url = hash;
-                } else {
-                    var url = questions_url + hash;
-                }
-                if (hash !== '' && hash !== undefined && url !== undefined){
-                    {# was this causing strange redirects in IE??? #}
-                    window.location = 'http://' + window.location.host + url;
-                }
-            }
-        {% endif %}
         // focus input on the search bar endcomment
         {% if active_tab in ('users', 'questions', 'tags') %}
             $('#keywords').focus();