aboutsummaryrefslogtreecommitdiff
path: root/mod/messages/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 22:29:24 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 22:29:24 +0000
commit89ce06e66737761f99949a32729f5a759630ce49 (patch)
treeeeeb44068b41a17d1fa29b24a1f76353bf0c407f /mod/messages/views
parent89cb69c643fc244bad8836a044cf47a719afb6e9 (diff)
downloadelgg-89ce06e66737761f99949a32729f5a759630ce49.tar.gz
elgg-89ce06e66737761f99949a32729f5a759630ce49.tar.bz2
cleared up confusion over elgg-icon-delete and elgg-button-delete
git-svn-id: http://code.elgg.org/elgg/trunk@8594 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/messages/views')
-rw-r--r--mod/messages/views/default/forms/messages/process.php1
-rw-r--r--mod/messages/views/default/object/messages.php7
2 files changed, 5 insertions, 3 deletions
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 5cdd01c1f..e415a092b 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -14,6 +14,7 @@ echo '<div class="messages-buttonbank">';
echo elgg_view('input/submit', array(
'value' => elgg_echo('delete'),
'name' => 'delete',
+ 'class' => 'elgg-button-delete',
));
if ($vars['folder'] == "inbox") {
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index 70a51bf57..1c97c8e36 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -54,11 +54,12 @@ $subject_info .= elgg_view('output/url', array(
'text' => $message->title,
));
-$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 right\"></span>",
'confirm' => elgg_echo('deleteconfirm'),
- )) . "</span>";
+ 'text_encode' => false,
+ ));
$body = <<<HTML
<div class="messages-owner">$user_link</div>