From: cash Date: Sat, 5 Mar 2011 22:29:24 +0000 (+0000) Subject: cleared up confusion over elgg-icon-delete and elgg-button-delete X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=89ce06e66737761f99949a32729f5a759630ce49;p=lorea%2Felgg.git 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 --- 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 '
'; 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 = "" . elgg_view("output/confirmlink", array( +$delete_link = elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), - 'text' => elgg_echo('delete'), + 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - )) . ""; + 'text_encode' => false, + )); $body = <<$user_link
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index acad271f7..a21fdee51 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -29,10 +29,10 @@ if ($delete_action && $annotation->canEdit()) { )); $delete_button = elgg_view("output/confirmlink", array( 'href' => $url, - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm') + 'text' => "", + 'confirm' => elgg_echo('deleteconfirm'), + 'text_encode' => false, )); - $delete_button = "$delete_button"; } $body = << $url, - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm') + 'text' => "", + 'confirm' => elgg_echo('deleteconfirm'), + 'text_encode' => false, )); - $delete_button = "$delete_button"; } $comment_text = elgg_view("output/longtext", array("value" => $comment->value)); diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php index 2d6a2fec5..e1ae20818 100644 --- a/views/default/annotation/likes.php +++ b/views/default/annotation/likes.php @@ -29,10 +29,10 @@ $friendlytime = elgg_view_friendly_time($like->time_created); if ($like->canEdit()) { $delete_button = elgg_view("output/confirmlink",array( 'href' => "action/likes/delete?annotation_id={$like->id}", - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm') + 'text' => "", + 'confirm' => elgg_echo('deleteconfirm'), + 'text_encode' => false, )); - $delete_button = "$delete_button"; } $body = <<_graphics/elgg_sprites.png") no-repeat -200px top; - text-indent: -9000px; - text-align: left; + color: #bbbbbb; + text-decoration: none; + border: 1px solid #333333; + background-color: #555555; + background-image: url(_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + text-shadow: 1px 1px 0px black; } -.elgg-button-delete a:hover { - background-position: -200px -16px; +.elgg-button-delete:hover { + color: #999999; + background-color: #333333; + background-position: left 10px; + text-decoration: none; } .elgg-button-dropdown { @@ -157,4 +152,4 @@ -webkit-border-radius:4px 4px 0 0; -moz-border-radius:4px 4px 0 0; border-radius:4px 4px 0 0; -} \ No newline at end of file +} diff --git a/views/default/input/submit.php b/views/default/input/submit.php index 31efa5cbf..64b135afa 100644 --- a/views/default/input/submit.php +++ b/views/default/input/submit.php @@ -7,6 +7,6 @@ */ $vars['type'] = 'submit'; -$vars['class'] = 'elgg-button-submit'; +$vars['class'] = elgg_extract('class', $vars, 'elgg-button-submit'); echo elgg_view('input/button', $vars); \ No newline at end of file