From c4fd0af16dbec94d8a15006dbe320dddc6d13d85 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 2 Aug 2016 18:21:43 -0700 Subject: [PATCH 1/6] comment policy permissions typo --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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']; From 0febfce268c7b7afbe90841e5afa99f4bc51b8c5 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 2 Aug 2016 19:31:31 -0700 Subject: [PATCH 2/6] missing comma in atoken update sql --- Zotlabs/Module/Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), From 61f591cc88ff8a5c1a3d46e892ed2dfed7934cae Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 3 Aug 2016 16:33:12 +0200 Subject: [PATCH 3/6] Improved a few schemas - context help fix - dark schemas now have dark text areas (et al.) --- view/theme/redbasic/schema/dark.css | 42 +++++++++++++++ .../redbasic/schema/simple_black_on_white.css | 7 +++ .../redbasic/schema/simple_green_on_black.css | 52 +++++++++++++++++-- .../redbasic/schema/simple_white_on_black.css | 44 ++++++++++++++++ 4 files changed, 141 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ea50f50ec..233d5c44c 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -3,6 +3,30 @@ background-color: transparent; } +textarea, input, select +{ + color: #BBB !important; + background: #333 !important; + border-color: #2B2B2B !important; + } + +#profile-jot-submit-wrapper { + border-top: none; +} + +#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 +414,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; +} From 416adeb169f16fd25f7dbf54232451d8647cc999 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 3 Aug 2016 16:41:36 +0200 Subject: [PATCH 4/6] belongs to previous commit --- view/theme/redbasic/schema/dark.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 233d5c44c..ed2714dfc 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -12,6 +12,7 @@ textarea, input, select #profile-jot-submit-wrapper { border-top: none; + padding: 10px 0; } #jot-title-wrap { From 178c9838710a1ca7069a5aed344490071dfca4cc Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 3 Aug 2016 16:10:28 -0700 Subject: [PATCH 5/6] issue #473 - unable to delete privacy groups --- Zotlabs/Module/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()) ); From 92862f93f31beb009247144bae5d8b0a58b562b5 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 3 Aug 2016 21:42:41 -0700 Subject: [PATCH 6/6] issue #474 --- view/tpl/profile_advanced.tpl | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 @@
- {{if $profile.like_count}} - - {{if $profile.likers}} - - {{/if}} - {{/if}} - {{if $profile.canlike}} - - {{/if}} {{if $editmenu.multi}}  {{$editmenu.edit.3}}
+
+ {{if $profile.like_count}} + + {{if $profile.likers}} + + {{/if}} + {{/if}} + {{if $profile.canlike}} + + {{/if}} +

{{$title}}