diff options
| author | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
| commit | b840c279957667168b400207caff14dc78043994 (patch) | |
| tree | ece0b11af5e7055226c566e4aa35ef4a7a781de0 /include | |
| parent | 2b3cc585a24cbdf97e8e2382752297bc4f725e12 (diff) | |
| parent | c732b72a0dde2c8b4d49e63114c9415f44a8a8d7 (diff) | |
| download | volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.gz volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.bz2 volse-hubzilla-b840c279957667168b400207caff14dc78043994.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index eb08fd79f..78aacf92b 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -238,11 +238,21 @@ class RedBrowser extends DAV\Browser\Plugin { $quota['limit'] = $limit; $quota['desc'] = $quotaDesc; - $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( + $output = ''; + if ($this->enablePost) { + $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); + } + + $html .= replace_macros(get_markup_template('cloud_header.tpl'), array( '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", + '$quota' => $quota, + '$total' => t('Total'), + '$actionspanel' => $output + )); + + $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( '$parentpath' => $parentpath, '$entries' => $f, - '$quota' => $quota, '$name' => t('Name'), '$type' => t('Type'), '$size' => t('Size'), @@ -250,15 +260,9 @@ class RedBrowser extends DAV\Browser\Plugin { '$parent' => t('parent'), '$edit' => t('Edit'), '$delete' => t('Delete'), - '$total' => t('Total') + '$nick' => $this->auth->getCurrentUser() )); - $output = ''; - if ($this->enablePost) { - $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); - } - $html .= $output; - get_app()->page['content'] = $html; load_pdl(get_app()); construct_page(get_app()); @@ -371,4 +375,4 @@ class RedBrowser extends DAV\Browser\Plugin { } return $id; } -}
\ No newline at end of file +} |