Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge

4 files changed, 33 insertions, 27 deletions

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 74917d089..5920efafa 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -71,3 +71,4 @@
 				<div class="clear"></div>
 			</form>
 		</div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 903a23eed..add80885b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -225,7 +225,6 @@
 		<div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" >
 			{{$item.comment}}
 		</div>
-		<div id="comment-edit-preview-{{$item.id}}" class="comment-edit-preview"></div>
 		<div class="clear"></div>
 		{{/if}}
 	</div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c0e17d6b5..5be6d21bd 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -12,7 +12,7 @@
 				<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 			</button>
 			{{if $nav.help.6}}
-			<button id="context-help-btn"class="navbar-toggle" type="button" onclick="contextualHelp(); return false;">
+			<button id="context-help-btn" class="navbar-toggle" type="button" onclick="contextualHelp(); return false;">
 				<i class="fa fa-question-circle"></i>
 			</button>
 			{{/if}}
@@ -56,7 +56,7 @@
 			{{if !$userinfo}}
 			{{if $nav.loginmenu}}
 				<li class="{{$nav.loginmenu.0.2}} hidden-xs">
-					<a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
+					<a data-toggle="dropdown" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
 					<ul class="dropdown-menu" role="menu">
 						{{foreach $nav.loginmenu as $loginmenu}}
 						<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 947bdd51c..59490ccc1 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,32 +1,38 @@
 <div id="profile-content-wrapper" class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<div class="pull-right dropdown">
-			{{if $editmenu.multi}}
-			<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-			<ul class="dropdown-menu" role="menu">
-				{{foreach $editmenu.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
-				</li>
-				{{/foreach}}
-				<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
-				{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
-			</ul>
-			{{elseif $editmenu}}
-			<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
-			{{/if}}
-		</div>
-		<div class="pull-right dropdown">
+		<div class="pull-right">
 			{{if $profile.like_count}}
-			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
-			{{if $profile.likers}}
-			<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
-			{{/if}}
+			<div class="btn-group">
+				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button>
+				{{if $profile.likers}}
+				<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul>
+				{{/if}}
+			</div>
 			{{/if}}
 			{{if $profile.canlike}}
-			<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
-				<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
-			</button>
+			<div class="btn-group">
+				<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
+					<i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
+				</button>
+			</div>
+			{{/if}}
+			{{if $editmenu.multi}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+				<ul class="dropdown-menu dropdown-menu-right" role="menu">
+					{{foreach $editmenu.menu.entries as $e}}
+					<li>
+						<a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
+					</li>
+					{{/foreach}}
+					<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
+					{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
+				</ul>
+			</div>
+			{{elseif $editmenu}}
+			<div class="btn-group">
+				<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+			</div>
 			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>