aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-06-19 20:13:43 -0400
committercash <cash.costello@gmail.com>2011-06-19 20:13:43 -0400
commit48f628e2901b4ddda87399aada6d7272ee6172dc (patch)
tree3088538c26beed3a43fd280aedfa00010340944e /mod
parent1c0234e0caebff139f707505ae353392ef3b7372 (diff)
downloadelgg-48f628e2901b4ddda87399aada6d7272ee6172dc.tar.gz
elgg-48f628e2901b4ddda87399aada6d7272ee6172dc.tar.bz2
moved the download button for files to the action menu (which probably needs to be a menu)
Diffstat (limited to 'mod')
-rw-r--r--mod/file/pages/file/view.php8
-rw-r--r--mod/file/views/default/object/file.php8
2 files changed, 7 insertions, 9 deletions
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index daa2a400e..45e112d4d 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -25,11 +25,17 @@ elgg_push_breadcrumb($title);
$content = elgg_view_entity($file, true);
$content .= elgg_view_comments($file);
+$download = elgg_view('output/url', array(
+ 'href' => "mod/file/download.php?file_guid=$file->guid",
+ 'text' => elgg_echo("file:download"),
+ 'class' => 'elgg-button elgg-button-action float-alt',
+));
+
$body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'header' => '',
+ 'buttons' => $download,
));
echo elgg_view_page($title, $body);
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 93a21c8e6..c6ac2a429 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -67,12 +67,6 @@ if ($full && !elgg_in_context('gallery')) {
$extra = elgg_view("file/specialcontent/$base_type/default", $vars);
}
- $download = elgg_view('output/url', array(
- 'href' => "mod/file/download.php?file_guid=$file->guid",
- 'text' => elgg_echo("file:download"),
- 'class' => 'elgg-button elgg-button-action',
- ));
-
$header = elgg_view_title($file->title);
$params = array(
@@ -87,12 +81,10 @@ if ($full && !elgg_in_context('gallery')) {
$file_info = elgg_view_image_block($file_icon, $list_body);
echo <<<HTML
-$header
$file_info
<div class="file elgg-content">
$body
$extra
- <p>$download</p>
</div>
HTML;