diff options
| author | friendica <info@friendica.com> | 2015-01-28 01:07:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-28 01:07:45 -0800 |
| commit | f1203bb3dd4df3330737c9a0b2be84ebf7c80162 (patch) | |
| tree | 10aed680a0b32ba7ae378793515f4420807363f9 | |
| parent | 9feb300f47eaff46ea78ef66379de654d3365dae (diff) | |
| parent | f455036905d83a7983998835b24bfcaf1bed1045 (diff) | |
| download | volse-hubzilla-f1203bb3dd4df3330737c9a0b2be84ebf7c80162.tar.gz volse-hubzilla-f1203bb3dd4df3330737c9a0b2be84ebf7c80162.tar.bz2 volse-hubzilla-f1203bb3dd4df3330737c9a0b2be84ebf7c80162.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 3 | ||||
| -rw-r--r-- | mod/share.php | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_header.tpl | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index e893d6ebd..8093aebc9 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -252,7 +252,8 @@ class RedBrowser extends DAV\Browser\Plugin { '$actionspanel' => $output, '$shared' => t('Shared'), '$create' => t('Create'), - 'upload' => t('Upload') + '$upload' => t('Upload'), + '$is_owner' => $is_owner )); $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( diff --git a/mod/share.php b/mod/share.php index 78a25ee10..d70336ed1 100644 --- a/mod/share.php +++ b/mod/share.php @@ -53,7 +53,7 @@ function share_init(&$a) { "' avatar='".$r[0]['author']['xchan_photo_s']. "' link='".$r[0]['plink']. "' posted='".$r[0]['created']. - "' message_id='".$r[0]['mid']."']\n"; + "' message_id='".$r[0]['mid']."']"; if($r[0]['title']) $o .= '[b]'.$r[0]['title'].'[/b]'."\n"; $o .= $r[0]['body']; diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 403323085..c75815d07 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,7 +1,9 @@ <div class="section-title-wrapper"> {{if $actionspanel}} <div class="pull-right"> + {{if $is_owner}} <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i> {{$shared}}</a> + {{/if}} <button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> {{$create}}</button> <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> {{$upload}}</button> </div> |