Эх сурвалжийг харах

[search] Polishing Twitter UI

Romain Rigaux 13 жил өмнө
parent
commit
abca687043

+ 8 - 4
apps/search/src/search/templates/index.mako

@@ -193,10 +193,10 @@ ${ commonheader(_('Search'), "search", user) }
                     <span class="caret"></span>
                   </a>
                   <ul class="dropdown-menu">
-                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}&sort=created_at+desc">Date</a></li>
-                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}&sort=retweet_count+desc">Retweets count</a></li>
+                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}&sort=created_at+desc&rows=${solr_query["rows"]}&start=${solr_query["start"]}">Date</a></li>
+                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}&sort=retweet_count+desc&rows=${solr_query["rows"]}&start=${solr_query["start"]}">Retweets count</a></li>
                     <li class="divider"></li>
-                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}">Reset sorting</a></li>
+                    <li><a href="?query=${solr_query["q"]}&fq=${solr_query["fq"]}&rows=${solr_query["rows"]}&start=${solr_query["start"]}">Reset sorting</a></li>
                   </ul>
                 </div>
             </form>
@@ -232,12 +232,15 @@ ${ commonheader(_('Search'), "search", user) }
         </div>
     </div>
 </div>
+<div class="hide">
+  ${rr}
+</div>
 
 <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
 <script>
   $(document).ready(function(){
     $("a[data-dt]").each(function(){
-      $(this).text(moment(new Date($(this).data("dt"))).fromNow());
+      $(this).text(moment($(this).data("dt")).add("hours", 7).fromNow());
     });
     $(".text").click(function(e){
       if ($(e.target).is("div")){
@@ -248,6 +251,7 @@ ${ commonheader(_('Search'), "search", user) }
         e.stopPropagation();
       }
     });
+    $("[rel='tooltip']").tooltip();
     $("[rel='popover']").popover();
     $("#recordsPerPage").change(function(){
       $("input[name='rows']").val($(this).val());

+ 3 - 3
apps/search/src/search/templates/macros.mako

@@ -180,11 +180,11 @@ def escape(text)  :
       <div class="content">
         <div class="stream-item-header">
           <small class="time">
-            <a href="https://twitter.com/${ result.get('user_screen_name', '') }/status/${ result.get('id', '') }" target="_blank" data-dt="${ result.get('created_at', '') }"></a>
+            <a href="https://twitter.com/${ result.get('user_screen_name', '') }/status/${ result.get('id', '') }" target="_blank" data-dt="${ result.get('created_at', '') }" rel="tooltip" data-placement="left" title="${ result.get('created_at', '') }"></a>
           </small>
           <a target="_blank" href="https://twitter.com/${ result.get('user_screen_name', '') }" class="account-group">
-            <img title="${ result.get('user_name', '') }" src="http://twitter.com/api/users/profile_image/${ result.get('user_screen_name', '') }" class="avatar"
-                 data-placement="left" rel="popover"  data-content="Location: ${ result.get('user_location', '') }<br/>User tweets #: ${ result.get('user_statuses_count', '') }<br/>User followers #: ${ result.get('user_followers_count', '') }" data-original-title="@${ result.get('user_screen_name', '') }" data-trigger="hover">
+            <img src="http://twitter.com/api/users/profile_image/${ result.get('user_screen_name', '') }" class="avatar"
+                 data-placement="left" rel="popover"  data-content="Location: ${ result.get('user_location', '') }<br/>User tweets #: ${ result.get('user_statuses_count', '') }<br/>User followers #: ${ result.get('user_followers_count', '') }" title="@${ result.get('user_screen_name', '') }" data-trigger="hover">
             <strong class="fullname">${ result.get('user_name', '') }</strong>
             <span>&rlm;</span><span class="username">@${ result.get('user_screen_name', '') }</span>
           </a>

+ 3 - 0
apps/search/src/search/views.py

@@ -69,8 +69,11 @@ class SolrApi(object):
                                                    ('facet', 'true'),
                                                    ('facet.limit', 10),
                                                    ('facet.mincount', 1),
+                                                   ('facet.sort', 'count'),                                                   
 
                                                    ('facet.field', 'user_location'),
+                                                   ('facet.field', 'user_statuses_count'),
+                                                   ('facet.field', 'user_followers_count'),
 
                                                    ('facet.range', 'retweet_count'),
                                                    ('f.retweet_count.facet.range.start', '0'),