Merge https://github.com/friendica/red into pending_merge

5 files changed, 35 insertions, 26 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 5d9bb6e90..a645b13d2 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -32,26 +32,6 @@ nav .dropdown-menu {
 	margin-top: 0px;
 }
 
-nav .dropdown-menu .contactname {
-	padding-top: 2px;
-	font-weight: bold;
-	display: block;
-}
-
-nav .dropdown-menu img {
-	float: left;
-	margin-right: 5px;
-	width: 32px;
-	height: 32px;
-}
-
-nav .dropdown-menu li a {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	line-height: 1em;
-	padding: 5px 10px;
-}
-
 nav .navbar-collapse .navbar-left {
 	float: left;
 }
@@ -67,11 +47,19 @@ nav .navbar-toggle {
 /* nav overrides end */
 
 .dropdown-menu img {
+	float: left;
 	width: 32px;
 	height: 32px;
 	margin-right: 5px;
 }
 
+.dropdown-menu li a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 1em;
+	padding: 5px 10px;
+}
+
 .nav-tabs.nav-justified > li {
 	white-space: nowrap;
 }
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 50ba99279..1c524789d 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -56,7 +56,7 @@ function contact_format(item) {
 		var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
 		if(typeof desc === 'undefined') desc = '';
 		if(desc) desc = ' ('+desc+')';
-		return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link)
+		return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link)
 	}
 	else
 		return "<div>"+item.text+"</div>"
@@ -111,7 +111,7 @@ function submit_form(e) {
 		replace: function(item) { return "$1"+item['text'] + ' '; },
 	}
 	this.attr('autocomplete','off');
-	this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1050});
+	this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1020});
   };
 })( jQuery );
 
@@ -130,7 +130,7 @@ function submit_form(e) {
 		template: contact_format,
 	}
 	this.attr('autocomplete','off');
-	var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1050});
+	var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1020,appendTo:'nav'});
 
 	a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
 	
@@ -153,7 +153,7 @@ function submit_form(e) {
 	}
 
 	this.attr('autocomplete','off');
-	var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1050});
+	var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1020});
 
 	if(autosubmit)
 		a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c24bee1fd..ce933ba10 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -874,6 +874,12 @@ footer {
 	font-family: FontAwesome;
 }
 
+nav .acpopup {
+	top: 49px !important;
+	right: 30px !important;
+	margin-left: -45px;
+}
+
 .profile-clear {
 	clear: both;
 }
@@ -1461,6 +1467,21 @@ header {
 	padding: 7px 7px 0px 0px;
 }
 
+.contactname {
+	padding-top: 2px;
+	font-weight: bold;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: block;
+}
+
+.dropdown-sub-text {
+	font-size: 0.833em;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: block;
+}
+
 .notify-seen a {
 	background: $notifyseen_bgcolour;
 	color: $notifyseen_linkcolour !important;
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index fdcc4521c..cfd22e607 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -1,5 +1,5 @@
 <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
+	<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
 </ul>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 6904c2fec..bff3148f3 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -6,7 +6,7 @@
 	<ul class="dropdown-menu" role="menu">
 		{{foreach $profile.menu.entries as $e}}
 		<li>
-			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
 		</li>
 		{{/foreach}}
 		<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>