updated the object/file view

git-svn-id: http://code.elgg.org/elgg/trunk@7770 36083f99-b078-4883-b0ff-0f9b5a30f544

22 files changed, 108 insertions, 124 deletions

diff --git a/mod/file/views/default/file/icon/application/default.php b/mod/file/views/default/file/icon/application/default.php
index d9d60901b..6a7c7e13c 100644
--- a/mod/file/views/default/file/icon/application/default.php
+++ b/mod/file/views/default/file/icon/application/default.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Default application icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/application{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'application';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/excel.php b/mod/file/views/default/file/icon/application/excel.php
index a4123ea6e..f5cfffb54 100644
--- a/mod/file/views/default/file/icon/application/excel.php
+++ b/mod/file/views/default/file/icon/application/excel.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Excel icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'excel';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/msword.php b/mod/file/views/default/file/icon/application/msword.php
index 074f7ed91..edb7b3694 100644
--- a/mod/file/views/default/file/icon/application/msword.php
+++ b/mod/file/views/default/file/icon/application/msword.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Word icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/word{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'word';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/pdf.php b/mod/file/views/default/file/icon/application/pdf.php
index 1aeafdb7b..2b32c5825 100644
--- a/mod/file/views/default/file/icon/application/pdf.php
+++ b/mod/file/views/default/file/icon/application/pdf.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * PDF icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/pdf{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'pdf';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/powerpoint.php b/mod/file/views/default/file/icon/application/powerpoint.php
index 47a15b639..fba3af016 100644
--- a/mod/file/views/default/file/icon/application/powerpoint.php
+++ b/mod/file/views/default/file/icon/application/powerpoint.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Powerpoint icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'ppt';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-excel.php b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
index a4123ea6e..fe5b22ff0 100644
--- a/mod/file/views/default/file/icon/application/vnd.ms-excel.php
+++ b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
@@ -1,10 +1,6 @@
 <?php
+/**
+ * Excel icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/application/excel', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
index 47a15b639..d6425be90 100644
--- a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
+++ b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
@@ -1,10 +1,6 @@
 <?php
+/**
+ * Powerpoint icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/application/powerpoint', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
index 309977160..82199922d 100644
--- a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
+++ b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Open Office icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/openoffice{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'openoffice';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/x-gzip.php b/mod/file/views/default/file/icon/application/x-gzip.php
index 72f839732..f90d28376 100644
--- a/mod/file/views/default/file/icon/application/x-gzip.php
+++ b/mod/file/views/default/file/icon/application/x-gzip.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * GZip icon
+ */
 
-	echo elgg_view('file/icon/archive',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/archive', $vars);
diff --git a/mod/file/views/default/file/icon/application/x-rar-compressed.php b/mod/file/views/default/file/icon/application/x-rar-compressed.php
index 72f839732..3cc09b6d9 100644
--- a/mod/file/views/default/file/icon/application/x-rar-compressed.php
+++ b/mod/file/views/default/file/icon/application/x-rar-compressed.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Rar icon
+ */
 
-	echo elgg_view('file/icon/archive',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/archive', $vars);
diff --git a/mod/file/views/default/file/icon/application/x-stuffit.php b/mod/file/views/default/file/icon/application/x-stuffit.php
index 72f839732..7491e77a9 100644
--- a/mod/file/views/default/file/icon/application/x-stuffit.php
+++ b/mod/file/views/default/file/icon/application/x-stuffit.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Stuffit icon
+ */
 
-	echo elgg_view('file/icon/archive',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/archive', $vars);
diff --git a/mod/file/views/default/file/icon/application/zip.php b/mod/file/views/default/file/icon/application/zip.php
index 72f839732..c0bb01a47 100644
--- a/mod/file/views/default/file/icon/application/zip.php
+++ b/mod/file/views/default/file/icon/application/zip.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Zip icon
+ */
 
-	echo elgg_view('file/icon/archive',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/archive', $vars);
diff --git a/mod/file/views/default/file/icon/archive.php b/mod/file/views/default/file/icon/archive.php
index 694574e8f..552f7f218 100644
--- a/mod/file/views/default/file/icon/archive.php
+++ b/mod/file/views/default/file/icon/archive.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Archive icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/archive{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'archive';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
diff --git a/mod/file/views/default/file/icon/audio.php b/mod/file/views/default/file/icon/audio.php
index ce6f6ab4f..9a42be9ac 100644
--- a/mod/file/views/default/file/icon/audio.php
+++ b/mod/file/views/default/file/icon/audio.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Audio icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/music{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'music';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
diff --git a/mod/file/views/default/file/icon/audio/default.php b/mod/file/views/default/file/icon/audio/default.php
index 2bd1498b2..60e03b6c4 100644
--- a/mod/file/views/default/file/icon/audio/default.php
+++ b/mod/file/views/default/file/icon/audio/default.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Audio default icon
+ */
 
-	echo elgg_view('file/icon/audio',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/audio', $vars);
diff --git a/mod/file/views/default/file/icon/default.php b/mod/file/views/default/file/icon/default.php
index ed1b71547..c4fc8e2a7 100644
--- a/mod/file/views/default/file/icon/default.php
+++ b/mod/file/views/default/file/icon/default.php
@@ -1,10 +1,16 @@
 <?php
+/**
+ * Default file icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo elgg_get_site_url()."mod/file/graphics/icons/general{$ext}.gif";
+$type = elgg_get_array_value('type', $vars, 'general');
 
-?>
\ No newline at end of file
+$size = elgg_get_array_value('size', $vars, '');
+if ($size == 'large') {
+	$ext = '_lrg';
+} else {
+	$ext = '';
+}
+
+$src = elgg_get_site_url() . "mod/file/graphics/icons/{$type}{$ext}.gif";
+echo "<img src=\"$src\" />";
diff --git a/mod/file/views/default/file/icon/document.php b/mod/file/views/default/file/icon/document.php
index fed4660fb..55a71394e 100644
--- a/mod/file/views/default/file/icon/document.php
+++ b/mod/file/views/default/file/icon/document.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Document icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/text{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'text';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/default.php b/mod/file/views/default/file/icon/text/default.php
index bf5da852d..f6b42b587 100644
--- a/mod/file/views/default/file/icon/text/default.php
+++ b/mod/file/views/default/file/icon/text/default.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Document default icon
+ */
 
-	echo elgg_view('file/icon/document',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/document', $vars);
diff --git a/mod/file/views/default/file/icon/text/directory.php b/mod/file/views/default/file/icon/text/directory.php
index 863e53d68..f221100cd 100644
--- a/mod/file/views/default/file/icon/text/directory.php
+++ b/mod/file/views/default/file/icon/text/directory.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Directory default icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/vcard{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'vcard';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/v-card.php b/mod/file/views/default/file/icon/text/v-card.php
index 5c8ecd855..3554f37c1 100644
--- a/mod/file/views/default/file/icon/text/v-card.php
+++ b/mod/file/views/default/file/icon/text/v-card.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * V-card icon
+ */
 
-	echo elgg_view('file/icon/text/directory',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/text/directory', $vars);
diff --git a/mod/file/views/default/file/icon/video.php b/mod/file/views/default/file/icon/video.php
index db3f001f7..ff6b7e68f 100644
--- a/mod/file/views/default/file/icon/video.php
+++ b/mod/file/views/default/file/icon/video.php
@@ -1,10 +1,8 @@
 <?php
+/**
+ * Video icon
+ */
 
-	if ($vars['size'] == 'large') {
-		$ext = '_lrg';
-	} else {
-		$ext = '';
-	}
-	echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/video{$ext}.gif\" border=\"0\" />";
+$vars['type'] = 'video';
 
-?>
\ No newline at end of file
+echo elgg_view('file/icon/default', $vars);
\ No newline at end of file
diff --git a/mod/file/views/default/file/icon/video/default.php b/mod/file/views/default/file/icon/video/default.php
index 0ff2db791..a33940ebf 100644
--- a/mod/file/views/default/file/icon/video/default.php
+++ b/mod/file/views/default/file/icon/video/default.php
@@ -1,5 +1,6 @@
 <?php
+/**
+ * Video default icon
+ */
 
-	echo elgg_view('file/icon/video',$vars);
-
-?>
\ No newline at end of file
+echo elgg_view('file/icon/video', $vars);