diff options
| author | Max Kostikov <max@kostikov.co> | 2019-12-04 15:42:48 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-12-04 15:42:48 +0100 |
| commit | 2dd2b755f121cc3cb701f5255222bacc5f360b82 (patch) | |
| tree | 60699ffd59ba106102b844410223d846867aeef9 | |
| parent | 5998445841225c286a7155d100dddc4c31079e84 (diff) | |
| parent | a6516341c50fb54b0d40b12fe76230f07e499fb2 (diff) | |
| download | volse-hubzilla-2dd2b755f121cc3cb701f5255222bacc5f360b82.tar.gz volse-hubzilla-2dd2b755f121cc3cb701f5255222bacc5f360b82.tar.bz2 volse-hubzilla-2dd2b755f121cc3cb701f5255222bacc5f360b82.zip | |
Merge branch 'dev' into 'dev'
Show unpin button in pinned post for owner only
See merge request hubzilla/core!1799
| -rw-r--r-- | Zotlabs/Widget/Pinned.php | 2 | ||||
| -rw-r--r-- | view/tpl/pinned_item.tpl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index ec2c7f4e8..3324206f4 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -154,7 +154,7 @@ class Pinned { 'embed' => $embed, 'plink' => get_plink($item), 'pinned' => t('Pinned post'), - 'pinme' => t('Unpin from the top'), + 'pinme' => (($observer['xchan_hash'] == $owner['xchan_hash']) ? t('Unpin from the top') : ''), 'hide' => (! $is_new && $observer && ($observer['xchan_hash'] != $owner['xchan_hash']) ? t("Don't show") : ''), // end toolbar buttons 'modal_dismiss' => t('Close'), diff --git a/view/tpl/pinned_item.tpl b/view/tpl/pinned_item.tpl index 17e82b410..a24c4ae44 100644 --- a/view/tpl/pinned_item.tpl +++ b/view/tpl/pinned_item.tpl @@ -137,7 +137,9 @@ {{if $plink}} <a class="dropdown-item" href="{{$plink.href}}" title="{{$plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$plink.title}}</a> {{/if}} - <a class="dropdown-item dropdown-item-pinnable" href="#" onclick="dopin({{$id}}); return false;"><i class="generic-icons-nav fa fa-fw fa-thumb-tack"></i>{{$pinme}}</a> + {{if $pinme}} + <a class="dropdown-item dropdown-item-pinnable" href="#" onclick="dopin({{$id}}); return false;"><i class="generic-icons-nav fa fa-fw fa-thumb-tack"></i>{{$pinme}}</a> + {{/if}} {{if $hide}} <a class="dropdown-item" href="#" onclick="dopinhide({{$id}}); return false;" class="u-url"><i class="generic-icons-nav fa fa-fw fa-remove"></i>{{$hide}}</a> {{/if}} |