3 files changed, 48 insertions, 57 deletions
diff --git a/mod/pages/views/default/widgets/pages/content.php b/mod/pages/views/default/widgets/pages/content.php
new file mode 100644
index 000000000..f63777c09
--- /dev/null
+++ b/mod/pages/views/default/widgets/pages/content.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Elgg pages widget
+ *
+ * @package ElggPages
+ */
+
+$num = (int) $vars['entity']->pages_num;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'page_top',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $num,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$url = "pages/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $url,
+		'text' => elgg_echo('pages:more'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('pages:none');
+}
diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php
index 9504d5fdb..f23514380 100644
--- a/mod/pages/views/default/widgets/pages/edit.php
+++ b/mod/pages/views/default/widgets/pages/edit.php
@@ -1,33 +1,24 @@
 <?php
+/**
+ * Elgg pages widget edit
+ *
+ * @package ElggPages
+ */
 
-    /**
-	 * Elgg pages widget edit
-	 *
-	 * @package ElggPages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
+// set default value
 if (!isset($vars['entity']->pages_num)) {
 	$vars['entity']->pages_num = 4;
 }
 
-?>
-<p>
-	<?php echo elgg_echo("pages:num"); ?>:
-	<select name="params[pages_num]">
-<?php
+$params = array(
+	'name' => 'params[pages_num]',
+	'value' => $vars['entity']->pages_num,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
 
-for ($i=1; $i<=10; $i++) {
-	$selected = '';
-	if ($vars['entity']->pages_num == $i) {
-		$selected = "selected='selected'";
-	}
-
-	echo "	<option value='{$i}' $selected >{$i}</option>\n";
-}
 ?>
-	</select>
-</p>
-\ No newline at end of file
+<div>
+	<?php echo elgg_echo('pages:num'); ?>:
+	<?php echo $dropdown; ?>
+</div>
diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php
deleted file mode 100644
index 425e4f501..000000000
--- a/mod/pages/views/default/widgets/pages/view.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<style type="text/css">
-#pages_widget .pagination {
-    display:none;
-}
-</style>
-<?php
-
-     /**
-	 * Elgg pages widget edit
-	 *
-	 * @package ElggPages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-     
-     $num_display = (int) $vars['entity']->pages_num;
-	 if (!$num_display) {
-		 $num_display = 4;
-	 }
-     
-     $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE));
-	 
-	 if ($pages) {
-		$pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username;
-		$pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>";
-	 }
-
-     echo "<div id=\"pages_widget\">" . $pages . "</div>";
-     
-?>
-\ No newline at end of file