diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-02-07 09:34:22 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-02-07 09:34:22 +0100 |
| commit | d70f0092f7369a87117898716893c16f8a09d4fe (patch) | |
| tree | adfa9afd69580d55af6daebcc388aa146a513f62 /view | |
| parent | 860dead9851116617a275fbe08e861ce5d8642f9 (diff) | |
| parent | 7f6e4a9744b7b5293e1f0d25db8bb3ad17cd256d (diff) | |
| download | volse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.tar.gz volse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.tar.bz2 volse-hubzilla-d70f0092f7369a87117898716893c16f8a09d4fe.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 11 |
3 files changed, 16 insertions, 1 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 69e09b272..428529de2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -146,6 +146,9 @@ {{if $item.share}} <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> {{/if}} + {{if $item.embed}} + <a class="dropdown-item" href="#" onclick="jotEmbed({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-share" title="{{$item.embed.0}}"></i>{{$item.embed.0}}</a> + {{/if}} {{if $item.plink}} <a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a> {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 28e120d17..63e74b159 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -139,6 +139,9 @@ {{if $item.share}} <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> {{/if}} + {{if $item.embed}} + <a class="dropdown-item" href="#" onclick="jotEmbed({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-share" title="{{$item.embed.0}}"></i>{{$item.embed.0}}</a> + {{/if}} {{if $item.plink}} <a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a> {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index b286b6071..42537f5e3 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -200,14 +200,23 @@ var activeCommentText = ''; function jotShare(id,post_type) { + $('#like-rotator-' + id).show(); + $.get('{{$baseurl}}/share/' + id, function(data) { + $('#like-rotator-' + id).hide(); + notificationsUpdate(); + }); + } + + function jotEmbed(id,post_type) { if(post_type == 6) { window.location.href = 'rpost?f=&post_id='+id; } else { + if ($('#jot-popup').length != 0) $('#jot-popup').show(); $('#like-rotator-' + id).show(); - $.get('{{$baseurl}}/share/' + id, function(data) { + $.get('{{$baseurl}}/embed/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); |