Merge remote-tracking branch 'upstream/dev' into dev

8 files changed, 158 insertions, 18 deletions

diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
index 254ee6ef2..291566c6d 100644
--- a/Zotlabs/Module/Group.php
+++ b/Zotlabs/Module/Group.php
@@ -101,7 +101,7 @@ class Group extends \Zotlabs\Web\Controller {
 			check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
 			
 			if(intval(argv(2))) {
-				$r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				$r = q("SELECT `gname` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval(argv(2)),
 					intval(local_channel())
 				);
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index ecf6d03d6..57a0aa535 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -145,7 +145,7 @@ class Settings extends \Zotlabs\Web\Controller {
 				return;
 			}
 			if($atoken_id) {
-				$r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s' 
+				$r = q("update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' 
 					where atoken_id = %d and atoken_uid = %d",
 					dbesc($name),
 					dbesc($token),
diff --git a/include/items.php b/include/items.php
index 178fb30d6..5bd0b0968 100755
--- a/include/items.php
+++ b/include/items.php
@@ -421,7 +421,7 @@ function post_activity_item($arr) {
 	$arr['deny_cid']     = ((x($arr,'deny_cid')) ? $arr['deny_cid'] : $channel['channel_deny_cid']);
 	$arr['deny_gid']     = ((x($arr,'deny_gid')) ? $arr['deny_gid'] : $channel['channel_deny_gid']);
 
-	$arr['comment_policy'] = map_scope(\Zotlabs\Access/PermissionLimits::Get($channel['channel_id'],'post_comments'));
+	$arr['comment_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'post_comments'));
 
 	if ((! $arr['plink']) && (intval($arr['item_thread_top']))) {
 		$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ea50f50ec..ed2714dfc 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -3,6 +3,31 @@
 	background-color: transparent;
 }
 
+textarea, input, select
+{
+  color: #BBB !important;
+  background: #333 !important;
+  border-color: #2B2B2B !important;
+ }
+
+#profile-jot-submit-wrapper {
+	border-top: none;
+	padding: 10px 0;
+}
+
+#jot-title-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+optgroup {
+	color: #CCC !important; 
+}
+
+option {
+	color: $link_colour !important;
+}
+
 .vcard, #contact-block, .widget {
 	background-color: transparent;
 	border: none;
@@ -390,3 +415,21 @@ pre {
   	box-shadow: 0px 3px 3px #222;
 }
 
+.contextual-help-content-open {
+	background: $nav_bg;
+	top: 50px;
+	border-bottom: #555 1px solid;
+	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
+}
+
+.contextual-help-tool {
+	opacity: 0.5;
+}
+
+.contextual-help-tool:hover {
+	opacity: 1;
+}
+
+.contextual-help-tool i {
+	color: $link_colour;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index b7cca0930..7dd8125a4 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -290,3 +290,10 @@ pre {
   	-webkit-box-shadow: none;
   	box-shadow: none;
 }
+
+
+.contextual-help-content-open {
+	background: #FFF;
+	top: 50px;
+
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 990980e8f..ca2e5b15a 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -3,6 +3,31 @@
 	background-color: transparent;
 }
 
+textarea, input, select
+{
+  color: $font_colour !important;
+  background: $bgcolour !important;
+  border: 1px solid #143D12 !important;
+ }
+
+#profile-jot-submit-wrapper {
+	border-top: none;
+	padding: 10px 0;
+}
+
+#jot-title-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+optgroup {
+	color: #32962D !important; 
+}
+
+option {
+	color: $link_colour !important;
+}
+
 .vcard, #contact-block, .widget {
 	background-color: transparent;
 	border: none;
@@ -153,22 +178,22 @@ input[type="submit"] {
 	color: #50f148 !important;
 }
 
-nav .dropdown-menu>li>a{
+nav .dropdown-menu>li>a {
 	color: #50f148;
 }
 
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus {
 	color: #50f148;
 	background-color: #143D12;
 	background-image: none;
 }
 
 
-nav .dropdown-menu .divider{
+nav .dropdown-menu .divider {
 	background-color: #143D12;
 }
 
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus {
 	color: #50f148;
 	background-color: #143D12;
 	background-image: none;
@@ -339,3 +364,22 @@ pre {
   	-webkit-box-shadow: none;
   	box-shadow: none;
 }
+
+.contextual-help-content-open {
+	background: $nav_bg;
+	top: 50px;
+	border-bottom: #1C5419 1px solid;
+	box-shadow: 0px 3px 3px rgba(28,84,25,0.2);
+}
+
+.contextual-help-tool {
+	opacity: 0.5;
+}
+
+.contextual-help-tool:hover {
+	opacity: 1;
+}
+
+.contextual-help-tool i {
+	color: $link_colour;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index c23dbaf68..a462c4d29 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -3,6 +3,31 @@
 	background-color: transparent;
 }
 
+textarea, input, select
+{
+  color: $font_colour !important;
+  background: $bgcolour !important;
+  border: 1px solid #FFF !important;
+ }
+
+#profile-jot-submit-wrapper {
+	border-top: none;
+	padding: 10px 0;
+}
+
+#jot-title-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+optgroup {
+	color: #FFF !important; 
+}
+
+option {
+	color: $link_colour !important;
+}
+
 .vcard, #contact-block, .widget {
 	background-color: transparent;
 	border: none;
@@ -312,3 +337,22 @@ pre {
   	-webkit-box-shadow: none;
   	box-shadow: none;
 }
+
+.contextual-help-content-open {
+	background: $nav_bg;
+	top: 50px;
+	border-bottom: #FFF 1px solid;
+	box-shadow: 0px 3px 3px rgba(255,255,255,0.2);
+}
+
+.contextual-help-tool {
+	opacity: 0.5;
+}
+
+.contextual-help-tool:hover {
+	opacity: 1;
+}
+
+.contextual-help-tool i {
+	color: $link_colour;
+}
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index d0c9621f9..947bdd51c 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,17 +1,6 @@
 <div id="profile-content-wrapper" class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right dropdown">
-			{{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}}
-			{{/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>
-			{{/if}}
 			{{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">
@@ -27,6 +16,19 @@
 			<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">
+			{{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}}
+			{{/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>
+			{{/if}}
+		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>