aboutsummaryrefslogtreecommitdiff
path: root/mod/file
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-27 03:12:42 -0700
committerCash Costello <cash.costello@gmail.com>2011-06-27 03:12:42 -0700
commite82534d0bceb80f7a9e7ba8f00748ee1eb32b214 (patch)
treeae8e98a12caa77f78dbfdbc9c492ee808c411c1c /mod/file
parent33f5c59d5318bc1e9a607215a31e48c6f7ab5b29 (diff)
parentfe1e3b3923659a4bea73e1596e0ba946f473635c (diff)
downloadelgg-e82534d0bceb80f7a9e7ba8f00748ee1eb32b214.tar.gz
elgg-e82534d0bceb80f7a9e7ba8f00748ee1eb32b214.tar.bz2
Merge pull request #52 from cash/banishing-auto-button
Fixes #3616 Banishing auto 'add' button
Diffstat (limited to 'mod/file')
-rw-r--r--mod/file/pages/file/edit.php1
-rw-r--r--mod/file/pages/file/friends.php1
-rw-r--r--mod/file/pages/file/owner.php5
-rw-r--r--mod/file/pages/file/search.php1
-rw-r--r--mod/file/pages/file/upload.php1
-rw-r--r--mod/file/pages/file/view.php8
-rw-r--r--mod/file/pages/file/world.php2
7 files changed, 10 insertions, 9 deletions
diff --git a/mod/file/pages/file/edit.php b/mod/file/pages/file/edit.php
index 66529af0b..b396c6e9b 100644
--- a/mod/file/pages/file/edit.php
+++ b/mod/file/pages/file/edit.php
@@ -35,7 +35,6 @@ $body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'buttons' => '',
));
echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index fc23e1d1e..7bde42962 100644
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -11,6 +11,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
elgg_push_breadcrumb(elgg_echo('friends'));
+elgg_register_add_button();
$title = elgg_echo("file:friends");
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index a01e9cd22..2244de095 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -13,6 +13,8 @@ $owner = elgg_get_page_owner_entity();
elgg_push_breadcrumb(elgg_echo('file'), "file/all");
elgg_push_breadcrumb($owner->name);
+elgg_register_add_button();
+
$params = array();
if ($owner->guid == elgg_get_logged_in_user_guid()) {
@@ -20,9 +22,8 @@ if ($owner->guid == elgg_get_logged_in_user_guid()) {
$params['filter_context'] = 'mine';
} else if (elgg_instanceof($owner, 'user')) {
// someone else's files
- // do not show button or select a tab when viewing someone else's posts
+ // do not show select a tab when viewing someone else's posts
$params['filter_context'] = 'none';
- $params['buttons'] = '';
} else {
// group files
$params['filter'] = '';
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 77c92f444..cffe67e0c 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -86,7 +86,6 @@ if ($tag) {
$body = elgg_view_layout('content', array(
'filter' => '',
- 'buttons' => '',
'content' => $content,
'title' => $title,
'sidebar' => $sidebar,
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index d97cc038d..3aa25b6db 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -32,7 +32,6 @@ $body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'buttons' => '',
));
echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 4b395d20d..50c55a74f 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -25,17 +25,17 @@ elgg_push_breadcrumb($title);
$content = elgg_view_entity($file, array('full_view' => true));
$content .= elgg_view_comments($file);
-$download = elgg_view('output/url', array(
+elgg_register_menu_item('title', array(
+ 'name' => 'download',
+ 'text' => elgg_echo('file:download'),
'href' => "mod/file/download.php?file_guid=$file->guid",
- 'text' => elgg_echo("file:download"),
- 'class' => 'elgg-button elgg-button-action float-alt',
+ 'link_class' => 'elgg-button elgg-button-action',
));
$body = elgg_view_layout('content', array(
'content' => $content,
'title' => $title,
'filter' => '',
- 'buttons' => $download,
));
echo elgg_view_page($title, $body);
diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php
index bfe965084..560743bed 100644
--- a/mod/file/pages/file/world.php
+++ b/mod/file/pages/file/world.php
@@ -7,6 +7,8 @@
elgg_push_breadcrumb(elgg_echo('file'));
+elgg_register_add_button();
+
$limit = get_input("limit", 10);
$title = elgg_echo('file:all');