]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c0234e)
moved the download button for files to the action menu (which probably needs to be...
authorcash <cash.costello@gmail.com>
Mon, 20 Jun 2011 00:13:43 +0000 (20:13 -0400)
committercash <cash.costello@gmail.com>
Mon, 20 Jun 2011 00:13:43 +0000 (20:13 -0400)
mod/file/pages/file/view.php patch | blob | history
mod/file/views/default/object/file.php patch | blob | history

diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index daa2a400e3307df97f8e9a4c433fd6beeafa34a3..45e112d4d3c791989411cea81a63419813e261a8 100644 (file)
--- 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 93a21c8e67fc8ce89d6b24c7ec9b4daf7e6fe1ca..c6ac2a429139f4302f586a0f65ad47e167436e55 100644 (file)
--- 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;
 
Social Networking Engine