Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod

2 files changed, 11 insertions, 8 deletions

diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index 0a6eba134..ba8f35050 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -34,11 +34,11 @@ 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');
 	}
@@ -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},
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;
 }