nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Add handle search terms
This commit is contained in:
Steffen van Bergerem 2014-11-24 18:02:48 +01:00
commit 77b627dbe9
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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) * 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) * 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) * 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 # 0.4.1.2

5
app/assets/javascripts/widgets/search.js
View file

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

20
app/assets/stylesheets/autocomplete.css.scss
View file

@ -3,7 +3,7 @@
background-color: transparent; background-color: transparent;
overflow: hidden; overflow: hidden;
z-index: 99999; z-index: 99999;
min-width: 247px !important; min-width: 300px !important;
width: 100%; width: 100%;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
@ -42,6 +42,8 @@
// in relative units scroll will be broken in firefox // in relative units scroll will be broken in firefox
//:line-height 16px //:line-height 16px
overflow: hidden; overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.ac_loading { .ac_loading {
@ -71,4 +73,20 @@
left: 5px; left: 5px;
top: 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;
}
} }