From fa04d6615760a014f7557f2d28ff864eebce8551 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 3 Oct 2011 21:30:30 -0400 Subject: removed the sections from the menu to provide more flexibility in tab ordering --- mod/file/start.php | 6 ++---- mod/file/views/default/embed/file_upload/content.php | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'mod/file') diff --git a/mod/file/start.php b/mod/file/start.php index 16ce0e233..843ae0794 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -61,9 +61,8 @@ function file_init() { $item = ElggMenuItem::factory(array( 'name' => 'file', 'text' => elgg_echo('file'), - 'section' => 'select', + 'priority' => 10, 'data' => array( - 'tab_type' => 'select', 'options' => array( 'type' => 'object', 'subtype' => 'file', @@ -75,9 +74,8 @@ function file_init() { $item = ElggMenuItem::factory(array( 'name' => 'file_upload', 'text' => elgg_echo('file:upload'), - 'section' => 'upload', + 'priority' => 100, 'data' => array( - 'tab_type' => 'upload', 'view' => 'embed/file_upload/content', ), )); diff --git a/mod/file/views/default/embed/file_upload/content.php b/mod/file/views/default/embed/file_upload/content.php index a530b3194..4d3db0d97 100644 --- a/mod/file/views/default/embed/file_upload/content.php +++ b/mod/file/views/default/embed/file_upload/content.php @@ -5,13 +5,9 @@ $form_vars = array( 'enctype' => 'multipart/form-data', - 'class' => 'elgg-form', + 'class' => 'elgg-form-embed', ); -$upload_content = elgg_view_form('file/upload', $form_vars); - -echo "
"; -echo $upload_content; -echo "
"; +echo elgg_view_form('file/upload', $form_vars); // the tab we want to be forwarded to after upload is complete echo elgg_view('input/hidden', array( -- cgit v1.2.3