12 files changed, 152 insertions, 128 deletions

diff --git a/mod/file/views/default/embed/file_upload/content.php b/mod/file/views/default/embed/file_upload/content.php
new file mode 100644
index 000000000..8b630c828
--- /dev/null
+++ b/mod/file/views/default/embed/file_upload/content.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Upload a file through the embed interface
+ */
+
+$form_vars = array(
+	'enctype' => 'multipart/form-data',
+	'class' => 'elgg-form-embed',
+);
+$body_vars = array('container_guid' => elgg_get_page_owner_guid());
+echo elgg_view_form('file/upload', $form_vars, $body_vars);
+
+// the tab we want to be forwarded to after upload is complete
+echo elgg_view('input/hidden', array(
+	'name' => 'embed_forward',
+	'value' => 'file',
+));
\ No newline at end of file
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 53fa94e46..5476ed7e2 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -5,25 +5,11 @@
  * @package ElggFile
  */
 ?>
-.file-image {
+.file-photo {
 	text-align: center;
-}
-.file-image img {
-	padding: 10px;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	background: #333333;
+	margin-bottom: 15px;
 }
 .file-gallery-item {
-	float: left;
 	text-align: center;
 	width: 165px;
-	margin: 10px 10px 0 0;
-	padding: 5px;
-	background-color: #eeeeee;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-}
-.file-gallery-item img {
-	margin: 5px 0;
 }
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
deleted file mode 100644
index 8536acd77..000000000
--- a/mod/file/views/default/file/embed_upload.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Files upload form for embed
- */
-
-echo elgg_view_form('file/upload', array('id' => 'file_embed_upload'), array('ajax' => TRUE));
-
-?>
-
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-$(document).ready(function() {
-	// fire off the ajax upload
-	$('#file_embed_upload').submit(function() {
-		var options = {
-			success: function(data) {
-				var info = jQuery.parseJSON(data);
-
-				if (info.status == 'success') {
-					$('.popup .content').load('<?php echo elgg_get_site_url() . 'pg/embed/embed'; ?>?active_section=file');
-				} else {
-					$('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
-				}
-			}
-		};
-		$(this).ajaxSubmit(options);
-		return false;
-	});
-});
-</script>
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index 8c80f297c..ad6c58dbb 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,14 +10,11 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pg/file/group/$group->guid/owner",
+	'href' => "file/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
 ));
 
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
-$header .= '<h3>' . elgg_echo('file:group') . '</h3>';
-
-
 elgg_push_context('widgets');
 $options = array(
 	'type' => 'object',
@@ -35,9 +32,14 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-	'href' => "pg/file/add/$group->guid",
+	'href' => "file/add/$group->guid",
 	'text' => elgg_echo('file:add'),
+	'is_trusted' => true,
 ));
-$content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-echo elgg_view_module('info', '', $content, array('header' => $header));
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('file:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/file/views/default/file/sidebar.php b/mod/file/views/default/file/sidebar.php
new file mode 100644
index 000000000..f61b8e64e
--- /dev/null
+++ b/mod/file/views/default/file/sidebar.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * File sidebar
+ */
+
+echo elgg_view('page/elements/comments_block', array(
+	'subtypes' => 'file',
+	'owner_guid' => elgg_get_page_owner_guid(),
+));
+
+echo elgg_view('page/elements/tagcloud_block', array(
+	'subtypes' => 'file',
+	'owner_guid' => elgg_get_page_owner_guid(),
+));
diff --git a/mod/file/views/default/file/specialcontent/image/default.php b/mod/file/views/default/file/specialcontent/image/default.php
index a55b97eb5..431ac9f4f 100644
--- a/mod/file/views/default/file/specialcontent/image/default.php
+++ b/mod/file/views/default/file/specialcontent/image/default.php
@@ -1,8 +1,20 @@
 <?php
 /**
  * Display an image
+ *
+ * @uses $vars['entity']
  */
 
-if ($vars['full'] && $smallthumb = $vars['entity']->smallthumb) {
-	echo "<p class=\"file-image\"><a href=\"".elgg_get_site_url()."mod/file/download.php?file_guid={$vars['entity']->getGUID()}\"><img src=\"".elgg_get_site_url()."mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large\" /></a></p>";
+$file = $vars['entity'];
+
+$image_url = $file->getIconURL('large');
+$image_url = elgg_format_url($image_url);
+$download_url = elgg_get_site_url() . "file/download/{$file->getGUID()}";
+
+if ($vars['full_view']) {
+	echo <<<HTML
+		<div class="file-photo">
+			<a href="$download_url"><img class="elgg-photo" src="$image_url" /></a>
+		</div>
+HTML;
 }
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index 0552f7e8e..4253bf674 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -4,7 +4,7 @@
  */
 
 function file_type_cloud_get_url($type, $friends) {
-	$url = elgg_get_site_url() . "mod/file/search.php?subtype=file";
+	$url = elgg_get_site_url() . 'file/search?subtype=file';
 
 	if ($type->tag != "all") {
 		$url .= "&md_type=simpletype&tag=" . urlencode($type->tag);
@@ -15,7 +15,7 @@ function file_type_cloud_get_url($type, $friends) {
 	} 
 
 	if ($type->tag == "image") {
-		$url .= "&listtype=gallery";
+		$url .= "&list_type=gallery";
 	}
 
 	if (elgg_get_page_owner_guid()) {
@@ -37,14 +37,14 @@ $all = new stdClass;
 $all->tag = "all";
 elgg_register_menu_item('page', array(
 	'name' => 'file:all',
-	'title' => elgg_echo('all'),
-	'url' =>  file_type_cloud_get_url($all, $friends),
+	'text' => elgg_echo('all'),
+	'href' =>  file_type_cloud_get_url($all, $friends),
 ));
 
 foreach ($types as $type) {
 	elgg_register_menu_item('page', array(
 		'name' => "file:$type->tag",
-		'title' => elgg_echo("file:type:$type->tag"),
-		'url' =>  file_type_cloud_get_url($type, $friends),
+		'text' => elgg_echo("file:type:$type->tag"),
+		'href' =>  file_type_cloud_get_url($type, $friends),
 	));
 }
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index 001e66674..f637a419e 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -11,13 +11,17 @@ $desc = elgg_extract('description', $vars, '');
 $tags = elgg_extract('tags', $vars, '');
 $access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
 $container_guid = elgg_extract('container_guid', $vars);
+if (!$container_guid) {
+	$container_guid = elgg_get_logged_in_user_guid();
+}
 $guid = elgg_extract('guid', $vars, null);
-$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');
 }
 
 ?>
@@ -49,21 +53,16 @@ if ($categories) {
 	<label><?php echo elgg_echo('access'); ?></label><br />
 	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
 
-//@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected
-if ($ajax) {
-	echo elgg_view('input/hidden', array('name' => 'ajax', 'value' => 1));
-}
-
 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/icon/object/file.php b/mod/file/views/default/icon/object/file.php
new file mode 100644
index 000000000..a3190310b
--- /dev/null
+++ b/mod/file/views/default/icon/object/file.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * File icon view
+ *
+ * @uses $vars['entity']     The entity the icon represents - uses getIconURL() method
+ * @uses $vars['size']       topbar, tiny, small, medium (default), large, master
+ * @uses $vars['href']       Optional override for link
+ * @uses $vars['img_class']  Optional CSS class added to img
+ * @uses $vars['link_class'] Optional CSS class added to link
+ */
+
+$entity = $vars['entity'];
+
+$sizes = array('small', 'medium', 'large', 'tiny', 'master', 'topbar');
+// Get size
+if (!in_array($vars['size'], $sizes)) {
+	$vars['size'] = "medium";
+}
+
+$title = $entity->title;
+$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8', false);
+
+$url = $entity->getURL();
+if (isset($vars['href'])) {
+	$url = $vars['href'];
+}
+
+$class = '';
+if (isset($vars['img_class'])) {
+	$class = $vars['img_class'];
+}
+if ($entity->thumbnail) {
+	$class = "class=\"elgg-photo $class\"";
+} else if ($class) {
+	$class = "class=\"$class\"";
+}
+
+$img_src = $entity->getIconURL($vars['size']);
+$img_src = elgg_format_url($img_src);
+$img = "<img $class src=\"$img_src\" alt=\"$title\" />";
+
+if ($url) {
+	$params = array(
+		'href' => $url,
+		'text' => $img,
+		'is_trusted' => true,
+	);
+	if (isset($vars['link_class'])) {
+		$params['class'] = $vars['link_class'];
+	}
+	echo elgg_view('output/url', $params);
+} else {
+	echo $img;
+}
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index bbc138826..64f19c483 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -5,7 +5,7 @@
  * @package ElggFile
  */
 
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
 $file = elgg_extract('entity', $vars, FALSE);
 
 if (!$file) {
@@ -19,17 +19,15 @@ $excerpt = elgg_get_excerpt($file->description);
 $mime = $file->mimetype;
 $base_type = substr($mime, 0, strpos($mime,'/'));
 
-$body = elgg_view('output/longtext', array('value' => $file->description));
-
 $owner_link = elgg_view('output/url', array(
-	'href' => "pg/file/owner/$owner->username",
+	'href' => "file/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
 
 $file_icon = elgg_view_entity_icon($file, 'small');
 
-$tags = elgg_view('output/tags', array('tags' => $file->tags));
 $date = elgg_view_friendly_time($file->time_created);
 
 $comments_count = $file->countComments();
@@ -39,17 +37,20 @@ if ($comments_count != 0) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $file->getURL() . '#file-comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
 }
 
-$metadata = elgg_view('layout/objects/list/metadata', array(
-	'entity' => $file,
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
 	'handler' => 'file',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {
@@ -65,34 +66,24 @@ 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-action',
-	));
-
-	$header = elgg_view_title($file->title);
-
 	$params = array(
 		'entity' => $file,
 		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 	);
-	$list_body = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
 
-	$file_info = elgg_view_image_block($file_icon, $list_body);
+	$text = elgg_view('output/longtext', array('value' => $file->description));
+	$body = "$text $extra";
 
-	echo <<<HTML
-$header
-$file_info
-<div class="file elgg-content">
-	$body
-	$extra
-	<p>$download</p>
-</div>
-HTML;
+	echo elgg_view('object/elements/full', array(
+		'entity' => $file,
+		'icon' => $file_icon,
+		'summary' => $summary,
+		'body' => $body,
+	));
 
 } elseif (elgg_in_context('gallery')) {
 	echo '<div class="file-gallery-item">';
@@ -107,10 +98,10 @@ HTML;
 		'entity' => $file,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($file_icon, $list_body);
 }
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index 620d1d18c..e8e6142e0 100644
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -7,29 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-$group_string = '';
-$container = $object->getContainerEntity();
-if ($container instanceof ElggGroup) {
-	$params = array(
-		'href' => $container->getURL(),
-		'text' => $container->name,
-	);
-	$group_link = elgg_view('output/url', $params);
-	$group_string = elgg_echo('river:ingroup', array($group_link));
-}
-
-echo elgg_echo('file:river:create');
-
-echo " $link $group_string";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
\ No newline at end of file
diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php
index d3deece56..f3e152de3 100644
--- a/mod/file/views/default/widgets/filerepo/content.php
+++ b/mod/file/views/default/widgets/filerepo/content.php
@@ -21,10 +21,11 @@ $content = elgg_list_entities($options);
 echo $content;
 
 if ($content) {
-	$url = "pg/file/owner/" . elgg_get_page_owner_entity()->username;
+	$url = "file/owner/" . elgg_get_page_owner_entity()->username;
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('file:more'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {