aboutsummaryrefslogtreecommitdiff
path: root/mod/file
diff options
context:
space:
mode:
Diffstat (limited to 'mod/file')
-rw-r--r--mod/file/actions/file/delete.php2
-rw-r--r--mod/file/actions/file/upload.php2
-rw-r--r--mod/file/manifest.xml1
-rw-r--r--mod/file/pages/file/search.php2
-rw-r--r--mod/file/pages/file/upload.php2
-rw-r--r--mod/file/pages/file/view.php10
-rw-r--r--mod/file/start.php4
-rw-r--r--mod/file/views/default/file/group_module.php2
-rw-r--r--mod/file/views/default/forms/file/upload.php4
-rw-r--r--mod/file/views/default/object/file.php12
10 files changed, 21 insertions, 20 deletions
diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index 622d02277..72585aa36 100644
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -27,7 +27,7 @@ if (!$file->delete()) {
}
if (elgg_instanceof($container, 'group')) {
- forward("file/group/$container->guid/owner");
+ forward("file/group/$container->guid/all");
} else {
forward("file/owner/$container->username");
}
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index 518d59891..c5fe763cb 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -193,7 +193,7 @@ if ($new_file) {
if (!$ajax) {
$container = get_entity($container_guid);
if (elgg_instanceof($container, 'group')) {
- forward("file/group/$container->guid/owner");
+ forward("file/group/$container->guid/all");
} else {
forward("file/owner/$container->username");
}
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 966aa1195..aac9c3f6b 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -5,6 +5,7 @@
<version>1.8</version>
<category>bundled</category>
<category>content</category>
+ <category>widget</category>
<description>File browser plugin</description>
<website>http://www.elgg.org/</website>
<copyright>See COPYRIGHT.txt</copyright>
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 2fa1ea60f..77c92f444 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -26,7 +26,7 @@ if ($owner) {
if (elgg_instanceof($owner, 'user')) {
elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
} else {
- elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+ elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
}
}
if ($friends && $owner) {
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index c19522530..d97cc038d 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -19,7 +19,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
if (elgg_instanceof($owner, 'user')) {
elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
} else {
- elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+ elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
}
elgg_push_breadcrumb($title);
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337..45e112d4d 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
$crumbs_title = $owner->name;
if (elgg_instanceof($owner, 'group')) {
- elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
+ elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/all");
} else {
elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
}
@@ -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/start.php b/mod/file/start.php
index d4f12e903..b94dc309a 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -73,7 +73,7 @@ function file_init() {
* View file: file/view/<guid>/<title>
* New file: file/add/<guid>
* Edit file: file/edit/<guid>
- * Group files: file/group/<guid>/owner
+ * Group files: file/group/<guid>/all
*
* Title is ignored
*
@@ -152,7 +152,7 @@ function file_owner_block_menu($hook, $type, $return, $params) {
$return[] = $item;
} else {
if ($params['entity']->file_enable != "no") {
- $url = "file/group/{$params['entity']->guid}/owner";
+ $url = "file/group/{$params['entity']->guid}/all";
$item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
$return[] = $item;
}
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index de8c62098..830b1096c 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
}
$all_link = elgg_view('output/url', array(
- 'href' => "file/group/$group->guid/owner",
+ 'href' => "file/group/$group->guid/all",
'text' => elgg_echo('link:view:all'),
));
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index 001e66674..b8a7a1668 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -16,8 +16,10 @@ $ajax = elgg_extract('ajax', $vars, FALSE);
if ($guid) {
$file_label = elgg_echo("file:replace");
+ $submit_label = elgg_echo('save');
} else {
$file_label = elgg_echo("file:file");
+ $submit_label = elgg_echo('upload');
}
?>
@@ -63,7 +65,7 @@ if ($guid) {
echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid));
}
-echo elgg_view('input/submit', array('value' => elgg_echo("save")));
+echo elgg_view('input/submit', array('value' => $submit_label));
?>
</div>
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 0b58ca76f..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(
@@ -82,17 +76,15 @@ if ($full && !elgg_in_context('gallery')) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $list_body = elgg_view('page/components/summary', $params);
+ $list_body = elgg_view('object/elements/summary', $params);
$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;
@@ -112,7 +104,7 @@ HTML;
'tags' => $tags,
'content' => $excerpt,
);
- $list_body = elgg_view('page/components/summary', $params);
+ $list_body = elgg_view('object/elements/summary', $params);
echo elgg_view_image_block($file_icon, $list_body);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 03:09:22 +0000