full text search with Sphinx, added session-based greeting message for the first time visitor

4 files changed, 45 insertions, 10 deletions

diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
index e2f4713e..c200b29d 100644
--- a/templates/authopenid/external_legacy_login_info.html
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -8,9 +8,8 @@
 </div>
 {% spaceless %}
 <div class="message">
-fill in template templates/authopenid/external_legacy_login_info.html
-and explain how to change password, recover password, etc.
 <!--add info about your external login site here-->
+{% trans "how to login with password through external login website" %}
 </div>
 {% endspaceless %}
 {% endblock %}
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 6c1d6a3f..65a323db 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -163,7 +163,7 @@ blockquote
     border-right:1px solid #b4b48e;
     border-bottom:1px solid #b4b48e;*/
     background: white;/* #f9f7ed;*/
-    margin:10px 0 10px 0;
+    margin:10px 0 0 0;
     /*background:url(../images/quest-bg.gif) repeat-x top;*/
 }
 #listA .qstA thumb {float:left; }
@@ -1144,6 +1144,9 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
 .message p {
     margin-bottom:0px;
 }
+.message p.space-above {
+    margin-top:10px;
+}
 
 .warning{color:red;}
 .darkred{color:darkred;}
diff --git a/templates/questions.html b/templates/questions.html
index f298381e..47bda129 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -21,7 +21,21 @@
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headQuestions">{% if searchtag %}{% trans "Found by tags" %}{% else %}{% if searchtitle %}{% trans "Found by title" %}{% else %}{% trans "All questions" %}{% endif %}{% endif %}</div>
+    <div class="headQuestions">
+        {% if searchtag %}
+            {% trans "Found by tags" %}
+        {% else %}
+            {% if searchtitle %}
+                {% if settings.USE_SPHINX_SEARCH %}
+                    {% trans "Search results" %}
+                {% else %}
+                    {% trans "Found by title" %}
+                {% endif %}
+            {% else %}
+                {% trans "All questions" %}
+            {% endif %}
+        {% endif %}
+    </div>
     <div class="tabsA">
         <a id="latest" href="?sort=latest" class="off" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a>
         <a id="active" href="?sort=active" class="off" title="{% trans "most recently updated questions" %}">{% trans "active" %}</a>
@@ -105,6 +119,17 @@
         </div>
     </div>
     {% endfor %}
+    {% if searchtitle %}
+        {% if questions_count == 0 %}
+        <p class="evenMore" style="padding-top:30px;text-align:center;">
+            {% trans "Did not find anything?" %}
+        {% else %}
+        <p class="evenMore" style="padding-left:9px">
+            {% trans "Did not find what you were looking for?" %} 
+        {% endif %}
+        <a href="{% url ask %}">{% trans "Please, post your question!" %}</a>
+        </p>
+    {% endif %}
 </div>
 {% endblock %}
 
@@ -130,11 +155,19 @@
 			{% endblocktrans %}
 		{% else %}
 			{% if searchtitle %}
-				{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
-				have total {{q_num}} questions containing {{searchtitle}}
-				{% plural %}
-				have total {{q_num}} questions containing {{searchtitle}}
-				{% endblocktrans %}
+                {% if settings.USE_SPHINX_SEARCH %}
+                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} questions containing {{searchtitle}} in full text
+                    {% plural %}
+                    have total {{q_num}} questions containing {{searchtitle}} in full text
+                    {% endblocktrans %}
+                {% else %}
+                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} questions containing {{searchtitle}}
+                    {% plural %}
+                    have total {{q_num}} questions containing {{searchtitle}}
+                    {% endblocktrans %}
+                {% endif %}
 			{% else %}
 				{% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
 				have total {{q_num}} questions
diff --git a/templates/user_info.html b/templates/user_info.html
index 4ebcddd6..c550e13f 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -19,7 +19,7 @@
                 <tr>
                     <td align="center">
                         <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "karma" %}</b></p>
+                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
                     </td>
                 </tr>
             </table>