Merge pull request #153 from rafalp/master

Syncing dev with master

misago/apps/search/views.py

@@ -92,10 +92,8 @@ class QuickSearchView(ViewBase):
         form_type = QuickSearchForm
         if self.request.method != "POST":
             form = QuickSearchForm(request=self.request)
-            return self.render_to_response('home', form,  
-                                           {
-                                            'search_result': self.request.session.get(self.results_route),
-                                           })
+            return self.render_to_response('home', form,
+                                           {'search_result': self.request.session.get('search_results')})
         
         try:
             form = QuickSearchForm(self.request.POST, request=self.request)

static/cranefly/css/cranefly.css

@@ -1229,10 +1229,11 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .search-suggestion .lead{color:#7b7b7b;}
 .search-suggestion form .btn-link{margin-top:1px;color:#3c85a3;font-size:21px;font-style:italic;font-weight:200;text-decoration:underline;}.search-suggestion form .btn-link:hover,.search-suggestion form .btn-link:active{color:#3c85a3;text-decoration:underline !important;}
 .search-resume .muted{color:#7b7b7b;}.search-resume .muted a{color:#333333;}
-.search-results .results-list .result{border-bottom:1px solid #eeeeee;margin-bottom:10px;padding-bottom:10px;}.search-results .results-list .result h3{margin:0px;line-height:20px;}.search-results .results-list .result h3 a:link,.search-results .results-list .result h3 a:visited{color:#555555;font-weight:normal;font-size:18.2px;text-decoration:underline;}
-.search-results .results-list .result h3 a:hover,.search-results .results-list .result h3 a:active{color:#333333;}
-.search-results .results-list .result .post-extra{margin:0px;color:#999999;font-size:11.200000000000001px;line-height:20px;}.search-results .results-list .result .post-extra a{color:#333333;}
-.search-results .results-list .result .post-preview{margin:0px;color:#333333;font-size:15.400000000000002px;line-height:20px;}.search-results .results-list .result .post-preview strong{color:#cf402e;}
+.search-results .results-list .result{border-bottom:1px solid #eeeeee;margin-bottom:10px;padding-bottom:10px;}.search-results .results-list .result .result-avatar{float:left;}.search-results .results-list .result .result-avatar img{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:70px;height:70px;}
+.search-results .results-list .result .result-content{margin-left:84px;}.search-results .results-list .result .result-content h3{margin:0px;line-height:20px;}.search-results .results-list .result .result-content h3 a:link,.search-results .results-list .result .result-content h3 a:visited{color:#555555;font-weight:normal;font-size:18.2px;text-decoration:underline;}
+.search-results .results-list .result .result-content h3 a:hover,.search-results .results-list .result .result-content h3 a:active{color:#333333;}
+.search-results .results-list .result .result-content .post-preview{margin:0px;margin-top:6px;color:#333333;font-size:15.400000000000002px;line-height:20px;}.search-results .results-list .result .result-content .post-preview strong{color:#cf402e;}
+.search-results .results-list .result .result-content .post-extra{margin:0px;color:#999999;font-size:11.200000000000001px;line-height:20px;}.search-results .results-list .result .result-content .post-extra a{color:#333333;}
 .index-rank-team ul li .label{background-color:#cf402e;color:#ffffff;text-shadow:0px 1px 0px #3d130e;}
 .post-label-team{background-color:#cf402e;}
 .index-rank-mvp ul li .label{background-color:#049cdb;color:#ffffff;text-shadow:0px 1px 0px #011f2c;}

static/cranefly/css/cranefly/search.less

@@ -47,44 +47,58 @@
       margin-bottom: (@baseLineHeight / 2);
       padding-bottom: (@baseLineHeight / 2);
 
-      h3 {
-        margin: 0px;
+      .result-avatar {
+        float: left;
 
-        line-height: @baseLineHeight;
-
-        a:link, a:visited {
-          color: @gray;
-          font-weight: normal;
-          font-size: @baseFontSize * 1.3;
-          text-decoration: underline;
-        }
-
-        a:hover, a:active {
-          color: @textColor;
+        img {
+          .border-radius(@baseBorderRadius);
+          width: 70px;
+          height: 70px;
         }
       }
 
-      .post-extra {
-        margin: 0px;
+      .result-content {
+        margin-left: 70px + @baseFontSize;
+        h3 {
+          margin: 0px;
+
+          line-height: @baseLineHeight;
 
-        color: @grayLight;
-        font-size: @baseFontSize * 0.8;
-        line-height: @baseLineHeight;
+          a:link, a:visited {
+            color: @gray;
+            font-weight: normal;
+            font-size: @baseFontSize * 1.3;
+            text-decoration: underline;
+          }
+
+          a:hover, a:active {
+            color: @textColor;
+          }
+        }
+
+        .post-preview {
+          margin: 0px;
+          margin-top: 6px;
 
-        a {
           color: @textColor;
+          font-size: @baseFontSize * 1.1;
+          line-height: @baseLineHeight;
+
+          strong {
+            color: @red;
+          }
         }
-      }
 
-      .post-preview {
-        margin: 0px;
+        .post-extra {
+          margin: 0px;
 
-        color: @textColor;
-        font-size: @baseFontSize * 1.1;
-        line-height: @baseLineHeight;
+          color: @grayLight;
+          font-size: @baseFontSize * 0.8;
+          line-height: @baseLineHeight;
 
-        strong {
-          color: @red;
+          a {
+            color: @textColor;
+          }
         }
       }
     }

templates/cranefly/search/home.html

@@ -4,8 +4,8 @@
 {% block action %}
 {% if search_result %}
 <div class="search-resume">
-  <p class="lead muted">{% trans search_query=style_query(search_result.search_query) %}Your search for "{{ search_query }}" is still available.{% endtrans %}</p>
-  <p class="lead muted">{% trans %}To discard it and start new search, enter phrases you want to find in text field above and press search button.{% endtrans %}</p>
+  <p class="lead muted">{% trans search_query=style_query(search_result.search_query) %}Your search results for query "{{ search_query }}" are still available.{% endtrans %}</p>
+  <p class="lead muted">{% trans %}To discard it and start new search, simply perform new search using form above.{% endtrans %}</p>
 </div>
 {% else %}
 <p class="lead">{% trans %}To search forums, enter phrases you want to find in text field above and press search button.{% endtrans %}</p>
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% macro style_query(query) -%}
-<a href="{{ results_route|url }}">{{ query }}</a>
+<a href="{% url 'search_results' %}">{{ query }}</a>
 {%- endmacro %}

templates/cranefly/search/results.html

@@ -6,13 +6,22 @@
 {% block action %}
   <div class="search-results">
     {% if results %}
-    <h2>{% trans results=results|length|intcomma %}Search has returned one result{% pluralize %}Search has returned {{ results }} results:{% endtrans %}</h2>
+    <h2>{% trans count=results|length, results=results|length|intcomma %}Search has returned one result:{% pluralize %}Search has returned {{ results }} results:{% endtrans %}</h2>
     <div class="results-list">
       {% for result in results %}
       <div class="result">
-        <h3><a href="{{ result.forum.thread_link('find')|url(thread=result.thread_id, slug=result.thread.slug, post=result.pk) }}">{{ result.thread.name }}</a></h3>
-        <p class="post-extra">{% trans forum=forum(result.forum), user=username(result), date=result.date|reltimesince|low %}In {{ forum }} by {{ user }} {{ date }}{% endtrans %}</p>
-        <p class="post-preview">{{ result.post_clean|highlight(search_query, 320)|safe }}</p>
+        <div class="result-avatar">
+          {% if result.user_id %}
+          <a href="{% url 'user' user=result.user.pk, username=result.user.username_slug %}"><img src="{{ result.user.get_avatar(70) }}" alt=""></a>
+          {% else %}
+          <img src="{{ macros.avatar_guest(80) }}" alt="{{ resut.user_name }}">
+          {% endif %}
+        </div>
+        <div class="result-content">
+          <h3><a href="{{ result.forum.thread_link('find')|url(thread=result.thread_id, slug=result.thread.slug, post=result.pk) }}">{{ result.thread.name }}</a></h3>
+          <p class="post-preview">{{ result.post_clean|highlight(search_query, 320)|safe }}</p>
+          <p class="post-extra">{% trans forum=forum(result.forum), user=username(result), date=result.date|reltimesince|low %}In {{ forum }} by {{ user }} {{ date }}{% endtrans %}</p>
+        </div>
       </div>
       {% endfor %}
     </div>