aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-14 14:03:04 -0800
committerzotlabs <mike@macgirvin.com>2016-11-14 14:03:04 -0800
commit078db2dd80ea143ecac349c68625fda49e910a63 (patch)
tree175900cc4bcec130d030b2d0d8f5763b96ba4096
parent544330345bf23b6b65e7592f1fcde75ce0bd72bb (diff)
parent192df273ccd2b9f527b44622379ebb6142fcc611 (diff)
downloadvolse-hubzilla-078db2dd80ea143ecac349c68625fda49e910a63.tar.gz
volse-hubzilla-078db2dd80ea143ecac349c68625fda49e910a63.tar.bz2
volse-hubzilla-078db2dd80ea143ecac349c68625fda49e910a63.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--include/widgets.php2
-rw-r--r--view/tpl/wikilist.tpl12
2 files changed, 8 insertions, 6 deletions
diff --git a/include/widgets.php b/include/widgets.php
index ff97b8bd5..071622387 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -917,7 +917,7 @@ function widget_wiki_list($arr) {
'$channel' => $channel['channel_address'],
'$wikis' => $wikis['wikis'],
// If the observer is the local channel owner, show the wiki controls
- '$showControls' => ((local_channel() === intval($channel['channel_id'])) ? true : false)
+ '$owner' => ((local_channel() === intval($channel['channel_id'])) ? true : false)
));
}
return '';
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 7cf04d35e..0828d78fa 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -2,11 +2,13 @@
<h3>{{$header}}</h3>
<div>
{{foreach $wikis as $wiki}}
- <div class="form-group" id="wiki-{{$wiki.resource_id}}">
- <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}"><b>{{$wiki.title}}</b></a>
- <i class="pull-right generic-icons fakelink fa fa-trash-o" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"></i>
- <i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}"></i>
- </div>
+ <div class="form-group" id="wiki-{{$wiki.resource_id}}">
+ <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}"><b>{{$wiki.title}}</b></a>
+ {{if $owner}}
+ <i class="pull-right drop-icons fakelink fa fa-trash-o" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"></i>
+ <i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}"></i>
+ {{/if}}
+ </div>
{{/foreach}}
</div>
</div>