5 files changed, 42 insertions, 50 deletions

diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index d9bf6d10e..ba8f35050 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -18,7 +18,7 @@ elgg.thewire.init = function() {
 	});
 
 	$(".thewire-previous").live('click', elgg.thewire.viewPrevious);
-}
+};
 
 /**
  * Update the number of characters left with every keystroke
@@ -34,15 +34,15 @@ elgg.thewire.textCounter = function(textarea, status, limit) {
 	status.html(remaining_chars);
 
 	if (remaining_chars < 0) {
-		status.parent().css("color", "#D40D12");
+		status.parent().addClass("thewire-characters-remaining-warning");
 		$("#thewire-submit-button").attr('disabled', 'disabled');
 		$("#thewire-submit-button").addClass('elgg-state-disabled');
 	} else {
-		status.parent().css("color", "");
+		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
@@ -57,16 +57,16 @@ elgg.thewire.viewPrevious = function(event) {
 	var postGuid = $link.attr("href").split("/").pop();
 	var $previousDiv = $("#thewire-previous-" + postGuid);
 
-	if ($link.html() == "<?php echo elgg_echo('thewire:hide'); ?>") {
-		$link.html("<?php echo elgg_echo('thewire:previous'); ?>");
-		$link.attr("title", "<?php echo elgg_echo('thewire:previous:help'); ?>");
+	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("<?php echo elgg_echo('thewire:hide'); ?>");
-		$link.attr("title", "<?php echo elgg_echo('thewire:hide:help'); ?>");
+		$link.html(elgg.echo('thewire:hide'));
+		$link.attr("title", elgg.echo('thewire:hide:help'));
 		
 		$.ajax({type: "GET",
-			url: "<?php echo $site_url . "ajax/view/thewire/previous"; ?>",
+			url: elgg.config.wwwroot + "ajax/view/thewire/previous",
 			dataType: "html",
 			cache: false,
 			data: {guid: postGuid},
@@ -81,6 +81,6 @@ elgg.thewire.viewPrevious = function(event) {
 	}
 
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index fbf592664..c75a42b3f 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -24,7 +24,7 @@ $object_link = elgg_view('output/url', array(
 
 $summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 	'summary' => $summary,
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index d1ef31993..d11cce74a 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -27,6 +27,9 @@ The Wire
 	text-align: right;
 	background: white;
 }
+.thewire-characters-remaining-warning {
+	color: #D40D12 !important;
+}
 .thewire-parent {
 	margin-left: 40px;
 }
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index ab20b5341..26e1403fe 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -9,8 +9,8 @@ $owner = $vars['entity']->guid;
 
 //grab the user's latest from the wire
 $params = array(
-	'types' => 'object',
-	'subtypes' => 'thewire',
+	'type' => 'object',
+	'subtype' => 'thewire',
 	'owner_guid' => $owner,
 	'limit' => 1,
 );
@@ -27,7 +27,7 @@ if ($latest_wire && count($latest_wire) > 0) {
 		$button = elgg_view('output/url', array(
 			'text' => elgg_echo('thewire:update'),
 			'href' => $url_to_wire,
-			'class' => 'elgg-button elgg-button-action right',
+			'class' => 'elgg-button elgg-button-action float-alt',
 			'is_trusted' => true,
 		));
 	}
diff --git a/mod/thewire/views/rss/object/thewire.php b/mod/thewire/views/rss/object/thewire.php
index 8229f46f1..8fddb8aa8 100644
--- a/mod/thewire/views/rss/object/thewire.php
+++ b/mod/thewire/views/rss/object/thewire.php
@@ -2,46 +2,35 @@
 /**
  * Elgg thewire rss view
  *
- * @package Elgg
- * @subpackage Core
+ * @package ElggTheWire
  */
 
 $owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-	$title = elgg_echo('thewire:by', array($owner->name));
-} else {
-	$subtitle = strip_tags($vars['entity']->description);
-	$title = elgg_get_excerpt($subtitle, 32);
+if (!$owner) {
+	return true;
 }
 
-?>
+$title = elgg_echo('thewire:by', array($owner->name));
 
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
+
+$description = elgg_autop($vars['entity']->description);
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item', $vars);
+
+$item = <<<__HTML
 <item>
-<guid isPermaLink='false'><?php echo $vars['entity']->getGUID(); ?></guid>
-<pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
-<link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
-<title><![CDATA[<?php echo $title; ?>]]></title>
-<description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-<?php
-$owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-	?>
-	<dc:creator><?php echo $owner->name; ?></dc:creator>
-	<?php
-}
-?>
-<?php
-if (
-	($vars['entity'] instanceof Locatable) &&
-	($vars['entity']->getLongitude()) &&
-	($vars['entity']->getLatitude())
-) {
-	?>
-	<georss:point>
-		<?php echo $vars['entity']->getLatitude(); ?> <?php echo $vars['entity']->getLongitude(); ?>
-	</georss:point>
-	<?php
-}
-?>
-<?php echo elgg_view('extensions/item'); ?>
+	<guid isPermaLink="true">$permalink</guid>
+	<pubDate>$pubdate</pubDate>
+	<link>$permalink</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$description]]></description>
+	$creator$georss$extension
 </item>
+
+__HTML;
+
+echo $item;