15 files changed, 332 insertions, 278 deletions

diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php
new file mode 100644
index 000000000..8607b3662
--- /dev/null
+++ b/mod/thewire/views/default/forms/thewire/add.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Wire add form body
+ *
+ * @uses $vars['post']
+ */
+
+elgg_load_js('elgg.thewire');
+
+$post = elgg_extract('post', $vars);
+
+$text = elgg_echo('post');
+if ($post) {
+	$text = elgg_echo('thewire:reply');
+}
+
+if ($post) {
+	echo elgg_view('input/hidden', array(
+		'name' => 'parent_guid',
+		'value' => $post->guid,
+	));
+}
+
+echo elgg_view('input/plaintext', array(
+	'name' => 'body',
+	'class' => 'mtm',
+	'id' => 'thewire-textarea',
+));
+?>
+<div id="thewire-characters-remaining">
+	<span>140</span> <?php echo elgg_echo('thewire:charleft'); ?>
+</div>
+<div class="elgg-foot mts">
+<?php
+
+echo elgg_view('input/submit', array(
+	'value' => $text,
+	'id' => 'thewire-submit-button',
+));
+?>
+</div>
\ No newline at end of file
diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
new file mode 100644
index 000000000..ba8f35050
--- /dev/null
+++ b/mod/thewire/views/default/js/thewire.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * The wire's JavaScript
+ */
+
+$site_url = elgg_get_site_url();
+
+?>
+
+elgg.provide('elgg.thewire');
+
+elgg.thewire.init = function() {
+	$("#thewire-textarea").live('keydown', function() {
+		elgg.thewire.textCounter(this, $("#thewire-characters-remaining span"), 140);
+	});
+	$("#thewire-textarea").live('keyup', function() {
+		elgg.thewire.textCounter(this, $("#thewire-characters-remaining span"), 140);
+	});
+
+	$(".thewire-previous").live('click', elgg.thewire.viewPrevious);
+};
+
+/**
+ * Update the number of characters left with every keystroke
+ *
+ * @param {Object}  textarea
+ * @param {Object}  status
+ * @param {integer} limit
+ * @return void
+ */
+elgg.thewire.textCounter = function(textarea, status, limit) {
+
+	var remaining_chars = limit - $(textarea).val().length;
+	status.html(remaining_chars);
+
+	if (remaining_chars < 0) {
+		status.parent().addClass("thewire-characters-remaining-warning");
+		$("#thewire-submit-button").attr('disabled', 'disabled');
+		$("#thewire-submit-button").addClass('elgg-state-disabled');
+	} else {
+		status.parent().removeClass("thewire-characters-remaining-warning");
+		$("#thewire-submit-button").removeAttr('disabled', 'disabled');
+		$("#thewire-submit-button").removeClass('elgg-state-disabled');
+	}
+};
+
+/**
+ * Display the previous wire post
+ *
+ * Makes Ajax call to load the html and handles changing the previous link
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.thewire.viewPrevious = function(event) {
+	var $link = $(this);
+	var postGuid = $link.attr("href").split("/").pop();
+	var $previousDiv = $("#thewire-previous-" + postGuid);
+
+	if ($link.html() == elgg.echo('thewire:hide')) {
+		$link.html(elgg.echo('thewire:previous'));
+		$link.attr("title", elgg.echo('thewire:previous:help'));
+		$previousDiv.slideUp(400);
+	} else {
+		$link.html(elgg.echo('thewire:hide'));
+		$link.attr("title", elgg.echo('thewire:hide:help'));
+		
+		$.ajax({type: "GET",
+			url: elgg.config.wwwroot + "ajax/view/thewire/previous",
+			dataType: "html",
+			cache: false,
+			data: {guid: postGuid},
+			success: function(htmlData) {
+				if (htmlData.length > 0) {
+					$previousDiv.html(htmlData);
+					$previousDiv.slideDown(600);
+				}
+			}
+		});
+
+	}
+
+	event.preventDefault();
+};
+
+elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 4ccd5d7f4..134c87243 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -1,69 +1,63 @@
 <?php
+/**
+ * View a wire post
+ * 
+ * @uses $vars['entity']
+ */
 
-	/**
-	 * Elgg Wire Posts Listings
-	 *
-	 * @package thewire
-	 *
-	 * @question - do we want users to be able to edit thewire?
-	 *
-	 * @uses $vars['entity'] Optionally, the note to view
-	 */
+elgg_load_js('elgg.thewire');
 
-if (isset($vars['entity'])) {
-	$user_name = $vars['entity']->getOwnerEntity()->name;
+$full = elgg_extract('full_view', $vars, FALSE);
+$post = elgg_extract('entity', $vars, FALSE);
 
-	//if the note is a reply, we need some more info
-	$note_url = '';
-	$note_owner = elgg_echo("thewire:notedeleted");
-?>
-<div class="wire_post">
-	<div class="wire_post_contents clearfix radius8">
+if (!$post) {
+	return true;
+}
 
-		<div class="wire_post_icon">
-		<?php
-				echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'tiny'));
-		?>
-		</div>
+// make compatible with posts created with original Curverider plugin
+$thread_id = $post->wire_thread;
+if (!$thread_id) {
+	$post->wire_thread = $post->guid;
+}
 
-		<div class="wire_post_options">
-		<?php
-			if(isloggedin()){
-		?>
-			<a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="action-button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
-			<?php
-			}//close reply if statement
-			// if the user looking at thewire post can edit, show the delete link
-			if ($vars['entity']->canEdit()) {
-			echo "<span class='delete-button'>" . elgg_view("output/confirmlink",array(
-					'href' => "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
-					'text' => elgg_echo('delete'),
-					'confirm' => elgg_echo('deleteconfirm'),
-				)) . "</span>";
-			}
-		?>
-		</div>
+$owner = $post->getOwnerEntity();
 
-		<div class="wire_post_info">
-			<a href="<?php echo elgg_get_site_url(); ?>pg/thewire/<?php echo $vars['entity']->getOwnerEntity()->username; ?>"><?php echo $user_name; ?></a>
-			<?php
-				$desc = $vars['entity']->description;
-				//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
-				echo parse_urls($desc);
-			?>
-			<p class="entity-subtext">
-			<?php
-				echo elgg_echo("thewire:wired") . " " . elgg_echo("thewire:strapline",
-								array(elgg_view_friendly_time($vars['entity']->time_created))
-				);
-				echo ' ';
-				echo elgg_echo('thewire:via_method', array(elgg_echo($vars['entity']->method)));
-				echo '.';
-			?>
-			</p>
-		</div>
-	</div>
-</div>
-<?php
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
+$owner_link = elgg_view('output/url', array(
+	'href' => "thewire/owner/$owner->username",
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+$author_text = elgg_echo('byline', array($owner_link));
+$date = elgg_view_friendly_time($post->time_created);
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $post,
+	'handler' => 'thewire',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+$subtitle = "$author_text $date";
+
+// do not show the metadata and controls in widget view
+if (elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+$params = array(
+	'entity' => $post,
+	'metadata' => $metadata,
+	'subtitle' => $subtitle,
+	'content' => thewire_filter($post->description),
+	'tags' => false,
+);
+$params = $params + $vars;
+$list_body = elgg_view('object/elements/summary', $params);
+
+echo elgg_view_image_block($owner_icon, $list_body);
+
+if ($post->reply) {
+	echo "<div class=\"thewire-parent hidden\" id=\"thewire-previous-{$post->guid}\">";
+	echo "</div>";
 }
-?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index b654ccb51..c75a42b3f 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -1,17 +1,31 @@
 <?php
+/**
+ * File river view.
+ */
 
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->description);
+$excerpt = thewire_filter($excerpt);
 
-$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
-$desc = $object->description;
-//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
-$string .= parse_urls($desc);
-$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
-	if (isloggedin()){
-		$string .= "<a class='river_comment_form_button link'>Comment</a>";
-		$string .= elgg_view('likes/forms/link', array('entity' => $object));
-	}
-$string .= "</span>";
-echo $string;
\ No newline at end of file
+$subject = $vars['item']->getSubjectEntity();
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$object_link = elgg_view('output/url', array(
+	'href' => "thewire/owner/$subject->username",
+	'text' => elgg_echo('thewire:wire'),
+	'class' => 'elgg-river-object',
+	'is_trusted' => true,
+));
+
+$summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'summary' => $summary,
+));
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index a00acaec5..d11cce74a 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -1,35 +1,24 @@
 <?php
-
-	/**
-	 * Elgg thewire CSS extender
-	 * 
-	 * @package ElggTheWire
-	 */
+/**
+ * The Wire CSS
+ */
 
 ?>
-/* new wire post form */
-.new_wire_post {
-	margin:10px 0 15px 0;
-	padding-bottom:15px;
-	border-bottom: 1px solid #dedede;
-}
-.new_wire_post input[type="submit"] {
-	margin:3px 0 0 0;
-	float:right;
+/********************************
+The Wire
+*********************************/
+#thewire-textarea {
+	height: 40px;
+	padding: 6px;
+}
+#thewire-characters-remaining {
+	text-align: right;
+	float: right;
+	font-weight: bold;
+	color: #333333;
 }
-.new_wire_post textarea {
-	width: 719px;
-	height: 52px;
-	padding: 2px 5px 5px 5px;
-	font-size: 120%;
+.thewire-characters-remaining {
 	color:#333333;
-}
-.character_count {
-	width: 642px;
-	color:#666666;
-}
-.character_count input { 
-	color:#666666;
 	border:none;
 	font-size: 100%;
 	font-weight: bold;
@@ -38,65 +27,9 @@
 	text-align: right;
 	background: white;
 }
-.character_count input:focus {
-	border:none;
-	background:white;
-}
-
-
-/* wire posts listings */
-.wire_post {
-	padding-bottom:10px;
-	margin-bottom:5px;
-	background-image: url(<?php echo elgg_get_site_url(); ?>mod/thewire/graphics/thewire_speech_bubble.gif);
-	background-repeat: no-repeat;
-	background-position: right bottom; 
-}
-.members-list .wire_post { /* when displayed in lists of friends */
-	margin-top:4px;
+.thewire-characters-remaining-warning {
+	color: #D40D12 !important;
 }
-.wire_post_contents {
-	background-color: #eeeeee;
-	margin:0;
-	padding:5px;
-	line-height: 1.2em;
-	min-height: 34px;
-	position: relative;
-}
-.wire_post_icon {
-    float:left;
-    margin-right:8px;
-}
-.wire_post_info {
-	margin-top:-3px;
-	float:left;
-	width:620px;
-	overflow: hidden;
-}
-.wire_post_options {
-	float:right;
-	width:65px;
-}
-.wire_post_options .action-button.reply.small {
-	float:right;
-}
-.wire_post_options .delete-button {
-	position: absolute;
-	bottom:5px;
-	right:5px;
-}
-
-
-/* latest wire post on profile page */
-.wire_post .action-button.update.small {
-	float:right;
-	padding:4px;
-	position: absolute;
-	bottom:5px;
-	right:5px;
-}
-
-/* river wire entry */
-.river_item .reply_link {
-	display:block;
+.thewire-parent {
+	margin-left: 40px;
 }
diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php
deleted file mode 100644
index a7f7977b7..000000000
--- a/mod/thewire/views/default/thewire/forms/add.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-	/**
-	 * Elgg thewire edit/add page
-	 * 
-	 * @package ElggTheWire
-	 * 
-	 */
-
-		$wire_user = get_input('wire_username');
-		if (!empty($wire_user)) { $msg = '@' . $wire_user . ' '; } else { $msg = ''; }
-
-?>
-<div class="new_wire_post clearfix">
-<h3><?php echo elgg_echo("thewire:doing"); ?></h3>
-<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/thewire/views/default/thewire/scripts/counter.js"></script>
-<form action="<?php echo elgg_get_site_url(); ?>action/thewire/add" method="post" name="new_post">
-	<?php
-		$action_txt = elgg_echo('post');
-	    $display .= "<textarea name='new_post_textarea' value='' onKeyDown=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\" onKeyUp=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\">{$msg}</textarea>";
-        $display .= "<input type='submit' class='action-button' value='{$action_txt}' />";
-        $display .= "<div class='character_count'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\">";
-        echo $display;
-        echo elgg_echo("thewire:charleft") . "</div>";
-		echo elgg_view('input/securitytoken');
-	?>
-	<input type="hidden" name="method" value="site" />
-</form>
-</div>
-<?php echo elgg_view('input/urlshortener'); ?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/notfound.php b/mod/thewire/views/default/thewire/notfound.php
deleted file mode 100644
index a3d08fe18..000000000
--- a/mod/thewire/views/default/thewire/notfound.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg shout not found page
-	 * 
-	 * @package ElggShouts
-	 */
-
-?>
-
-	<p>
-		<?php
-
-			echo elgg_echo("thewire:notfound");
-		
-		?>
-	</p>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/previous.php b/mod/thewire/views/default/thewire/previous.php
new file mode 100644
index 000000000..e1ca83e24
--- /dev/null
+++ b/mod/thewire/views/default/thewire/previous.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Serve up html for a post
+ */
+
+$guid = (int) get_input('guid');
+
+$parent = thewire_get_parent($guid);
+if ($parent) {
+	echo elgg_view_entity($parent);
+}
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 09d878c81..26e1403fe 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -1,33 +1,44 @@
 <?php
-
 /**
- * Latest wire post on profile activity page
+ * Latest wire post on profile page
+ *
+ * @uses $vars['entity'] User that owns this profile page
  */
- 
+
 $owner = $vars['entity']->guid;
-$url_to_wire = elgg_get_site_url() . "pg/thewire/" . $vars['entity']->username;
-	
+
 //grab the user's latest from the wire
 $params = array(
-	'types' => 'object',
-	'subtypes' => 'thewire',
+	'type' => 'object',
+	'subtype' => 'thewire',
 	'owner_guid' => $owner,
 	'limit' => 1,
 );
 $latest_wire = elgg_get_entities($params);
 
-if ($latest_wire) {
-	foreach ($latest_wire as $lw) {
-		$content = $lw->description;
-		$time = "<p class='entity-subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
-	}
+if ($latest_wire && count($latest_wire) > 0) {
+	$latest_wire = $latest_wire[0];
+	$content = thewire_filter($latest_wire->description);
+	$time = "<p class='elgg-subtext'>(" . elgg_view_friendly_time($latest_wire->time_created) . ")</p>";
 
-	echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>";
-	echo $content;
-	if ($owner == get_loggedin_userid()) {
-		$text = elgg_echo('thewire:update');
-		echo "<a class='action-button update small' href=\"{$url_to_wire}\">$text</a>";
+	$button = '';
+	if ($owner == elgg_get_logged_in_user_guid()) {
+		$url_to_wire = "thewire/owner/" . $vars['entity']->username;
+		$button = elgg_view('output/url', array(
+			'text' => elgg_echo('thewire:update'),
+			'href' => $url_to_wire,
+			'class' => 'elgg-button elgg-button-action float-alt',
+			'is_trusted' => true,
+		));
 	}
-	echo $time;
-	echo "</div></div>";
+
+	$body = $content . $time;
+	$content = elgg_view_image_block('', $body, array('image_alt' => $button));
+
+	echo <<< HTML
+<div class="wire-status elgg-border-plain pam mbm clearfix">
+	$content
+</div>
+HTML;
+
 }
diff --git a/mod/thewire/views/default/thewire/reply.php b/mod/thewire/views/default/thewire/reply.php
new file mode 100644
index 000000000..341b691b1
--- /dev/null
+++ b/mod/thewire/views/default/thewire/reply.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Reply header
+ */
+
+$post = $vars['post'];
+$poster = $post->getOwnerEntity();
+$poster_details = array(
+	htmlspecialchars($poster->name,  ENT_QUOTES, 'UTF-8'),
+	htmlspecialchars($poster->username,  ENT_QUOTES, 'UTF-8'),
+);
+?>
+<b><?php echo elgg_echo('thewire:replying', $poster_details); ?>: </b>
+<?php echo $post->description;
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/scripts/counter.js b/mod/thewire/views/default/thewire/scripts/counter.js
index 7486bd1de..0d416fa9a 100644
--- a/mod/thewire/views/default/thewire/scripts/counter.js
+++ b/mod/thewire/views/default/thewire/scripts/counter.js
@@ -2,10 +2,6 @@
  * Elgg thewire text counter
  * 
  * @package ElggTheWire
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
  *
  * @question - do we want users to be able to edit thewire?
  * 
@@ -26,4 +22,4 @@ function textCounter(field,cntfield,maxlimit) {
         // otherwise, update 'characters left' counter
         cntfield.value = maxlimit - field.value.length;
     }
-}
\ No newline at end of file
+}
diff --git a/mod/thewire/views/default/thewire/sidebar.php b/mod/thewire/views/default/thewire/sidebar.php
new file mode 100644
index 000000000..a8aadd1f8
--- /dev/null
+++ b/mod/thewire/views/default/thewire/sidebar.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * The wire sidebar
+ */
+
+echo elgg_view('page/elements/tagcloud_block', array(
+	'subtypes' => 'thewire',
+	'owner_guid' => elgg_get_page_owner_guid(),
+));
diff --git a/mod/thewire/views/default/thewire/view.php b/mod/thewire/views/default/thewire/view.php
deleted file mode 100644
index 725643cd1..000000000
--- a/mod/thewire/views/default/thewire/view.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-	/**
-	 * Elgg thewire view page
-	 * 
-	 * @package ElggTheWire
-	 * 
-	 * @uses $vars['entity'] An array of wire notes to view
-	 * 
-	 */
-	 
-	// If there are any wire notes to view, view them
-		if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
-			
-			foreach($vars['entity'] as $shout) {
-				
-				echo elgg_view_entity($shout);
-				
-			}
-			
-		}
-
-?>
\ No newline at end of file
diff --git a/mod/thewire/views/default/widgets/thewire/content.php b/mod/thewire/views/default/widgets/thewire/content.php
index bed5c140b..7212d4397 100644
--- a/mod/thewire/views/default/widgets/thewire/content.php
+++ b/mod/thewire/views/default/widgets/thewire/content.php
@@ -1,15 +1,30 @@
 <?php
-		
+/**
+ * User wire post widget display view
+ */
+
 $num = $vars['entity']->num_display;
-if (!$num) {
-	$num = 4;
-}
 
-$content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'full_view' => FALSE, 'pagination' => FALSE));
+$options = array(
+	'type' => 'object',
+	'subtype' => 'thewire',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $num,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
 
 echo $content;
 
 if ($content) {
-	$blogurl = elgg_get_site_url() . "pg/thewire/" . elgg_get_page_owner()->username;
-	echo "<div class=\"shares_widget_wrapper\"><a href=\"{$blogurl}\">".elgg_echo('thewire:moreposts')."</a></div>";
+	$owner_url = "thewire/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $owner_url,
+		'text' => elgg_echo('thewire:moreposts'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('thewire:noposts');
 }
diff --git a/mod/thewire/views/default/widgets/thewire/edit.php b/mod/thewire/views/default/widgets/thewire/edit.php
index 969015ab8..cee3f769d 100644
--- a/mod/thewire/views/default/widgets/thewire/edit.php
+++ b/mod/thewire/views/default/widgets/thewire/edit.php
@@ -1,22 +1,22 @@
 <?php
+/**
+ * User wire widget edit view
+ */
+
 // set default value
 if (!isset($vars['entity']->num_display)) {
 	$vars['entity']->num_display = 4;
 }
-?>
-<p>
-	<?php echo elgg_echo("thewire:num"); ?>
-	<select name="params[num_display]">
-<?php
-$options = array(1,2,3,4,5,6);
-foreach ($options as $option)  {
-	$selected = '';
-	if ($vars['entity']->num_display == $option) {
-		$selected = "selected='selected'";
-	}
 
-	echo "	<option value='{$option}' $selected >{$option}</option>\n";
-}
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
+
 ?>
-	</select>
-</p>
\ No newline at end of file
+<div>
+	<?php echo elgg_echo('thewire:num'); ?>:
+	<?php echo $dropdown; ?>
+</div>