diff options
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 6 | ||||
| -rw-r--r-- | include/follow.php | 7 | ||||
| -rw-r--r-- | view/js/main.js | 16 | ||||
| -rwxr-xr-x | view/tpl/contact_slider.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 4 |
6 files changed, 26 insertions, 15 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 6fae69fcd..6763e0ef4 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -453,6 +453,7 @@ class Notifier { 'recipients' => $recipients, 'item' => $item, 'target_item' => $target_item, + 'parent_item' => $parent_item, 'top_level_post' => $top_level_post, 'private' => $private, 'relay_to_owner' => $relay_to_owner, @@ -559,6 +560,7 @@ class Notifier { 'recipients' => $recipients, 'item' => $item, 'target_item' => $target_item, + 'parent_item' => $parent_item, 'hub' => $hub, 'top_level_post' => $top_level_post, 'private' => $private, diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 2a9a7e779..ad944203c 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -746,9 +746,9 @@ class ThreadItem { '$sourceapp' => \App::$sourcename, '$observer' => get_observer_hash(), '$anoncomments' => (($conv->get_mode() === 'channel' && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), - '$anonname' => [ 'anonname', t('Your full name (required)'),'','' ], - '$anonmail' => [ 'anonmail', t('Your email address (required)'),'','' ], - '$anonurl' => [ 'anonurl', t('Your website URL (optional)'),'','' ] + '$anonname' => [ 'anonname', t('Your full name (required)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ], + '$anonmail' => [ 'anonmail', t('Your email address (required)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ], + '$anonurl' => [ 'anonurl', t('Your website URL (optional)'),'','','','onBlur="commentCloseUI(this,\'' . $this->get_id() . '\')"' ] )); return $comment_box; diff --git a/include/follow.php b/include/follow.php index 130f8b06b..56d8294c5 100644 --- a/include/follow.php +++ b/include/follow.php @@ -138,6 +138,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) ); if(! $r) { + // attempt network auto-discovery $d = discover_by_webbie($url,$protocol); @@ -146,11 +147,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // try RSS discovery - if(get_config('system','feed_contacts')) { + $feeds = get_config('system','feed_contacts'); + + if(($feeds) && ($protocol === '' || $protocol === 'feed')) { $d = discover_by_url($url); } else { - $result['message'] = t('Protocol disabled.'); + $result['message'] = t('Remote channel or protocol unavailable.'); return $result; } } diff --git a/view/js/main.js b/view/js/main.js index e4cfcf7b2..f928fa377 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -21,15 +21,20 @@ function commentOpenUI(obj, id) { } function commentCloseUI(obj, id) { - $(document).unbind( "click.commentClose", handler ); + var form_id = $(obj)[0].form.id; + + $('#' + form_id).on('click', function(e) { + $(document).unbind( "click.commentClose", handler ); + }); var handler = function() { - if(obj.value === '') { - obj.value = aStr.comment; + if($('#comment-edit-text-' + id).val() === '') { + $('#comment-edit-text-' + id).val(aStr.comment); $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeAttr('tabindex'); $("#comment-edit-submit-" + id).removeAttr('tabindex'); $("#comment-tools-" + id).hide(); + $("#comment-edit-anon-" + id).hide(); } }; @@ -42,8 +47,8 @@ function commentOpen(obj, id) { $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).show(); + $("#comment-tools-" + id).show(); $("#comment-edit-anon-" + id).show(); - openMenu("comment-tools-" + id); return true; } return false; @@ -55,7 +60,8 @@ function commentClose(obj, id) { $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).hide(); - closeMenu("comment-tools-" + id); + $("#comment-tools-" + id).hide(); + $("#comment-edit-anon-" + id).hide(); return true; } return false; diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 550abc147..0848df673 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -4,10 +4,10 @@ $(document).ready(function() { // The slider does not render correct if width is given in % and // the slider container is hidden (display: none) during rendering. // So let's unhide it to render and hide again afterwards. - if(!$("#affinity-tool-collapse").hasClass("in")) { - $("#affinity-tool-collapse").addClass("in"); + if(!$("#affinity-tool-collapse").hasClass("show")) { + $("#affinity-tool-collapse").addClass("show"); makeContactSlider(); - $("#affinity-tool-collapse").removeClass("in"); + $("#affinity-tool-collapse").removeClass("show"); } else { makeContactSlider(); diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 28667eb58..50c0116fb 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -106,8 +106,8 @@ {{if $item.mode === 'moderate'}} <div class="wall-item-tools-left btn-group"> - <a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a> - <a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a> + <a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a> + <a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a> </div> |