diff --git a/Changelog.md b/Changelog.md index cbc752990..4c479ce09 100644 --- a/Changelog.md +++ b/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 diff --git a/app/assets/javascripts/widgets/search.js b/app/assets/javascripts/widgets/search.js index c114a8818..cdd94feef 100644 --- a/app/assets/javascripts/widgets/search.js +++ b/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 "" + row.name; + if (row.avatar) { + return "" + row.name + "
" + row.handle + "
"; } else { - return row.name; + return row.name + "
" + row.handle + "
"; } } }; diff --git a/app/assets/stylesheets/autocomplete.css.scss b/app/assets/stylesheets/autocomplete.css.scss index bed1a77b4..6523cdf98 100644 --- a/app/assets/stylesheets/autocomplete.css.scss +++ b/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; + } }