Merge pull request #5419 from SansPseudoFix/add-handle-search-terms

Add handle search terms

Changelog.md

@@ -111,6 +111,7 @@ This is disabled by default since it requires the installation of additional pac
 * Ask for confirmation when leaving a submittable publisher [#5309](https://github.com/diaspora/diaspora/pull/5309)
 * Allow page-specific styling via individual CSS classes [#5282](https://github.com/diaspora/diaspora/pull/5282)
 * Change diaspora logo in the header on hover [#5355](https://github.com/diaspora/diaspora/pull/5355)
+* Display diaspora handle in search results [#5419](https://github.com/diaspora/diaspora/pull/5419)
 
 # 0.4.1.2
 

app/assets/javascripts/widgets/search.js

@@ -10,6 +10,7 @@
         searchFormAction: searchForm.attr("action"),
         searchInput: searchForm.find("input[type='search']"),
         searchInputName: searchForm.find("input[type='search']").attr("name"),
+        searchInputHandle: searchForm.find("input[type='search']").attr("handle"),
         options: {
           cacheLength : 15,
           delay : 800,
@@ -33,10 +34,10 @@
       if (typeof row.search !== "undefined") {
         return Diaspora.I18n.t("search_for", row);
       } else {
-				if (row.avatar) {        
-					return "<img src='"+ row.avatar +"' class='avatar'/>" + row.name;
+				if (row.avatar) {
+					return "<img src='"+ row.avatar +"' class='avatar'/>" + row.name + "<div class='search_handle'>" + row.handle + "</div>";
 				} else {
-					return row.name;				
+					return row.name + "<div class='search_handle'>" + row.handle + "</div>";
 				}
       }
     };

app/assets/stylesheets/autocomplete.css.scss

@@ -3,7 +3,7 @@
   background-color: transparent;
   overflow: hidden;
   z-index: 99999;
-  min-width: 247px !important;
+  min-width: 300px !important;
   width: 100%;
 
   -webkit-border-radius: 3px;
@@ -42,6 +42,8 @@
   // in relative units scroll will be broken in firefox
   //:line-height 16px
   overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .ac_loading {
@@ -71,4 +73,20 @@
     left: 5px;
     top: 5px;
   }
+
+  .search_handle {
+    font-size: 0.8em;
+    color: #999;
+    margin-top: -3px;
+  }
+
+  .ac_over .search_handle{
+    color: #fff;
+  }
+
+  .ac_over .search_handle, .search_handle {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }