diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-06 19:59:07 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-06 19:59:07 -0700 |
| commit | 5877e28d729489a9ba75397bcbe86c8a811c87e8 (patch) | |
| tree | 9164526f92eac5f345fd96c8c2d8291aad4496e6 /view/tpl | |
| parent | 9ca7cc565b1821c3f121e568b59bdebe8899eed8 (diff) | |
| parent | 643f515eaf21c05e03f0f51a332c18e0acdc403d (diff) | |
| download | volse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.tar.gz volse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.tar.bz2 volse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cards.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 27 |
4 files changed, 22 insertions, 22 deletions
diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl index a06e2fd22..60e6163ae 100644 --- a/view/tpl/cards.tpl +++ b/view/tpl/cards.tpl @@ -1,9 +1,4 @@ -<div class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <h2>{{$title}}</h2> - </div> - <div id="live-cards"></div> - {{$editor}} - {{$content}} -</div> - {{$pager}} +<div id="live-cards"></div> +{{$editor}} +{{$content}} +{{$pager}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 663b02890..b3fe60750 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -151,7 +151,7 @@ </button> <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} - <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> + <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.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> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index e442dd3cc..e599f84b5 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -150,7 +150,7 @@ </button> <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} - <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> + <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.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> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 91c30423d..2d37b3ca2 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -247,18 +247,23 @@ var activeCommentText = ''; } - function jotShare(id) { - if ($('#jot-popup').length != 0) $('#jot-popup').show(); - - $('#like-rotator-' + id).spin('tiny'); - $.get('{{$baseurl}}/share/' + id, function(data) { - if (!editor) $("#profile-jot-text").val(""); - initEditor(function(){ - addeditortext(data); - $('#like-rotator-' + id).spin(false); - $(window).scrollTop(0); + function jotShare(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).spin('tiny'); + $.get('{{$baseurl}}/share/' + id, function(data) { + if (!editor) $("#profile-jot-text").val(""); + initEditor(function(){ + addeditortext(data); + $('#like-rotator-' + id).spin(false); + $(window).scrollTop(0); + }); }); - }); + } } function linkdropper(event) { |