3 files changed, 51 insertions, 96 deletions

diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php
new file mode 100644
index 000000000..f3e152de3
--- /dev/null
+++ b/mod/file/views/default/widgets/filerepo/content.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Elgg file widget view
+ *
+ * @package ElggFile
+ */
+
+
+$num = $vars['entity']->num_display;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'file',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $num,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$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 {
+	echo elgg_echo('file:none');
+}
diff --git a/mod/file/views/default/widgets/filerepo/edit.php b/mod/file/views/default/widgets/filerepo/edit.php
index 0d1901662..cab35b6ef 100644
--- a/mod/file/views/default/widgets/filerepo/edit.php
+++ b/mod/file/views/default/widgets/filerepo/edit.php
@@ -1,30 +1,25 @@
 <?php
+/**
+ * Elgg file widget edit view
+ *
+ * @package ElggFile
+ */
+
+
 // set default value
 if (!isset($vars['entity']->num_display)) {
 	$vars['entity']->num_display = 4;
 }
-?>
-<p>
-	<?php echo elgg_echo("file:num_files"); ?>:
-	<select name="params[num_display]">
-<?php
-$options = array(1,2,3,4,5,6,7,8,9,10,15,20);
-foreach ($options as $option)  {
-	$selected = '';
-	if ($vars['entity']->num_display == $option) {
-		$selected = "selected='selected'";
-	}
 
-	echo "	<option value='{$option}' $selected >{$option}</option>\n";
-}
-?>
-	</select>
-</p>
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20),
+);
+$dropdown = elgg_view('input/dropdown', $params);
 
-<p>
-    <?php echo elgg_echo("file:gallery_list"); ?>?
-    <select name="params[gallery_list]">
-        <option value="1" <?php if($vars['entity']->gallery_list == 1) echo "SELECTED"; ?>><?php echo elgg_echo("file:list"); ?></option>
-	    <option value="2" <?php if($vars['entity']->gallery_list == 2) echo "SELECTED"; ?>><?php echo elgg_echo("file:gallery"); ?></option>
-    </select>
-</p>
\ No newline at end of file
+?>
+<div>
+	<?php echo elgg_echo('file:num_files'); ?>:
+	<?php echo $dropdown; ?>
+</div>
diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php
deleted file mode 100644
index aac2c4012..000000000
--- a/mod/file/views/default/widgets/filerepo/view.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-    //the page owner
-	$owner = $vars['entity']->owner_guid;
-
-	//the number of files to display
-	$number = (int) $vars['entity']->num_display;
-	if (!$number) {
-		$number = 4;
-	}
-
-	//get the layout view which is set by the user in the edit panel
-	$get_view = (int) $vars['entity']->gallery_list;
-	if (!$get_view || $get_view == 1) {
-	    $view = "list";
-    }else{
-        $view = "gallery";
-    }
-
-	//get the user's files
-	$files = get_user_objects($vars['entity']->owner_guid, "file", $number, 0);
-
-	//if there are some files, go get them
-	if ($files) {
-
-    	echo "<div id='filerepo_widget_layout'>";
-
-        if($view == "gallery"){
-
-        echo "<div class='filerepo_widget_galleryview'>";
-
-            //display in gallery mode
-            foreach($files as $f){
-
-                $mime = $f->mimetype;
-                echo "<a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a>";
-
-            }
-
-            echo "</div>";
-
-        }else{
-
-            //display in list mode
-            foreach($files as $f){
-
-                $mime = $f->mimetype;
-                echo "<div class='filerepo_widget_singleitem clearfloat'>";
-            	echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-            	echo "<div class='filerepo_widget_content'>";
-            	echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
-            	echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
-		        echo "</div></div>";
-
-        	}
-
-        }
-
-
-        //get a link to the users files
-        $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username;
-
-        echo "<div class='filerepo_widget_singleitem_more'><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
-        echo "</div>";
-
-
-	} else {
-
-		echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
-
-	}
-
-?>
\ No newline at end of file