diff options
| author | zotlabs <mike@macgirvin.com> | 2019-02-07 19:54:07 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-02-07 19:54:07 -0800 |
| commit | 4837f9cdad47b6709b8b5cefac821d28435d6783 (patch) | |
| tree | a423148e097d1f9b651730876342b8916ae0c350 /view/tpl | |
| parent | 317c53acf6b74a4f92284074017985fb09662a46 (diff) | |
| parent | 2b7a60522394d87eb3362829497e7a1a2542ca55 (diff) | |
| download | volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.tar.gz volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.tar.bz2 volse-hubzilla-4837f9cdad47b6709b8b5cefac821d28435d6783.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 42537f5e3..9a44f1a54 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -198,12 +198,11 @@ var activeCommentText = ''; }) } - function jotShare(id,post_type) { $('#like-rotator-' + id).show(); $.get('{{$baseurl}}/share/' + id, function(data) { $('#like-rotator-' + id).hide(); - notificationsUpdate(); + updateInit(); }); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 4eae33d13..12509fc59 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -137,8 +137,11 @@ <i id="profile-nocomment" class="fa fa-comments jot-icons"></i> </button> {{/if}} + {{if $custommoretoolsbuttons}} + {{$custommoretoolsbuttons}} + {{/if}} </div> - {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}} + {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting || $custommoretoolsdropdown}} <div class="btn-group d-lg-none"> <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> @@ -176,6 +179,8 @@ {{if $feature_nocomment}} <a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i> {{$nocommenttitlesub}}</a> {{/if}} + <hr /> + {{$custommoretoolsdropdown}} </div> </div> {{/if}} @@ -186,6 +191,11 @@ </div> </div> <div id="profile-jot-submit-right" class="btn-group float-right"> + {{foreach $customsubmitright as $csr}} + <button class="btn btn-outline-secondary btn-sm" {{$csr.buttonparams}} title="{{$csr.preview}}"> + {{$csr.buttoncontent}} + </button> + {{/foreach}} {{if $preview}} <button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="fa fa-eye jot-icons" ></i> |