6 files changed, 67 insertions, 59 deletions

diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 5cdd01c1f..cb30792e9 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -8,12 +8,23 @@
  * 
  */
 
-echo $vars['list'];
+$messages = $vars['list'];
+if (!$messages) {
+	echo elgg_echo('messages:nomessages');
+	return true;
+}
+
+echo '<div class="messages-container">';
+echo $messages;
+echo '</div>';
+
+echo '<div class="elgg-foot messages-buttonbank">';
 
-echo '<div class="messages-buttonbank">';
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo('delete'),
 	'name' => 'delete',
+	'class' => 'elgg-button-delete elgg-requires-confirmation',
+	'title' => elgg_echo('deleteconfirm:plural'),
 ));
 
 if ($vars['folder'] == "inbox") {
@@ -30,13 +41,3 @@ echo elgg_view('input/button', array(
 ));
 
 echo '</div>';
-
-?>
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-toggle").click(function() {
-		$('input[type=checkbox]').click();
-	});
-});
-</script>
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index 2288f25f4..9f3f4b57e 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -33,15 +33,6 @@ echo elgg_view('input/hidden', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-show-reply").click(function() {
-		$('#messages-reply-form').slideToggle('medium');
-	});
-});
-	
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php
index c0a095993..5b7e7830e 100644
--- a/mod/messages/views/default/forms/messages/send.php
+++ b/mod/messages/views/default/forms/messages/send.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Compse message form
+ * Compose message form
  *
  * @package ElggMessages
  * @uses $vars['friends']
@@ -49,6 +49,6 @@ $recipient_drop_down = elgg_view('input/dropdown', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
 </div>
diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
index ba8444f03..f304e0f15 100644
--- a/mod/messages/views/default/messages/css.php
+++ b/mod/messages/views/default/messages/css.php
@@ -6,7 +6,9 @@
  */
 ?>
 
-
+.messages-container {
+	min-height: 200px;
+}
 .message.unread a {
 	color: #d40005;
 }
@@ -37,27 +39,23 @@
 	float: left;
 	width: 5%;
 }
-
-/*** messages/new messages icon & counter in elgg-topbar ***/
-.messages-icon {
-	background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px;
-	position: relative;
-}
-.messages-icon:hover {
-	text-decoration: none;
-	background-position: left -36px;
-}
-.messages-icon.new span {
+/*** topbar icon ***/
+.messages-new {
 	color: white;
 	background-color: red;
+	
 	-webkit-border-radius: 10px; 
 	-moz-border-radius: 10px;
-	-webkit-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* safari v3+ */
-	-moz-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* FF v3.5+ */
+	border-radius: 10px;
+	
+	-webkit-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50);
+	-moz-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50);
+	box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50);
+	
 	position: absolute;
 	text-align: center;
-	top: -2px;
-	left: 10px;
+	top: 0px;
+	left: 26px;
 	min-width: 16px;
 	height: 16px;
 	font-size: 10px;
diff --git a/mod/messages/views/default/messages/js.php b/mod/messages/views/default/messages/js.php
new file mode 100644
index 000000000..60cf36b92
--- /dev/null
+++ b/mod/messages/views/default/messages/js.php
@@ -0,0 +1,7 @@
+
+// messages plugin toggle
+elgg.register_hook_handler('init', 'system', function() {
+	$("#messages-toggle").click(function() {
+		$('input[type=checkbox]').click();
+	});
+});
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index 70a51bf57..b12f98522 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -5,25 +5,27 @@
  * @package ElggFile
  */
 
-$full = elgg_extract('full', $vars, false);
+$full = elgg_extract('full_view', $vars, false);
 $message = elgg_extract('entity', $vars, false);
 
 if (!$message) {
 	return true;
 }
 
-if ($full) {
-	$message->readYet = true;
-}
-
 if ($message->toId == elgg_get_page_owner_guid()) {
 	// received
 	$user = get_entity($message->fromId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "pg/messages/compose?send_to=$user->guid",
-		'text' => $user->name,
-	));
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => $user->name,
+			'is_trusted' => true,
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	if ($message->readYet) {
 		$class = 'message read';
@@ -34,11 +36,18 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 } else {
 	// sent
 	$user = get_entity($message->toId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "pg/messages/compose?send_to=$user->guid",
-		'text' => elgg_echo('messages:to_user', array($user->name)),
-	));
+
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => elgg_echo('messages:to_user', array($user->name)),
+			'is_trusted' => true,
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	$class = 'message read';
 }
@@ -52,13 +61,15 @@ if (!$full) {
 $subject_info .= elgg_view('output/url', array(
 	'href' => $message->getURL(),
 	'text' => $message->title,
+	'is_trusted' => true,
 ));
 
-$delete_link = "<span class='elgg-button elgg-button-delete'>" . elgg_view("output/confirmlink", array(
+$delete_link = elgg_view("output/confirmlink", array(
 						'href' => "action/messages/delete?guid=" . $message->getGUID(),
-						'text' => elgg_echo('delete'),
+						'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
 						'confirm' => elgg_echo('deleteconfirm'),
-					)) . "</span>";
+						'encode_text' => false,
+					));
 
 $body = <<<HTML
 <div class="messages-owner">$user_link</div>