aboutsummaryrefslogtreecommitdiffstats
path: root/include/RedDAV/RedBrowser.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-19 16:44:16 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-19 16:44:16 -0700
commit0a9d3b4025cf49537c16868a093640fe7891d21c (patch)
tree742b700de282c4c432beec3193e2b61b01aca07d /include/RedDAV/RedBrowser.php
parent6bd90816dd76d5fbd2374f72ac302537bc1ef047 (diff)
parent8b563951ff9019e6a0c3a459ad5b768826a2017c (diff)
downloadvolse-hubzilla-0a9d3b4025cf49537c16868a093640fe7891d21c.tar.gz
volse-hubzilla-0a9d3b4025cf49537c16868a093640fe7891d21c.tar.bz2
volse-hubzilla-0a9d3b4025cf49537c16868a093640fe7891d21c.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/RedDAV/RedBrowser.php')
-rw-r--r--include/RedDAV/RedBrowser.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index a0330d7cc..d74bba220 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin {
$this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
}
- $html .= replace_macros(get_markup_template('cloud_header.tpl'), array(
+ $html .= replace_macros(get_markup_template('cloud.tpl'), array(
'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
'$quota' => $quota,
'$total' => t('Total'),
@@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin {
'$shared' => t('Shared'),
'$create' => t('Create'),
'$upload' => t('Upload'),
- '$is_owner' => $is_owner
- ));
-
- $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
+ '$is_owner' => $is_owner,
'$parentpath' => $parentpath,
'$entries' => $f,
'$name' => t('Name'),