aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--mod/messages/views/default/forms/messages/process.php1
-rw-r--r--mod/messages/views/default/object/messages.php7
-rw-r--r--views/default/annotation/default.php6
-rw-r--r--views/default/annotation/generic_comment.php6
-rw-r--r--views/default/annotation/likes.php6
-rw-r--r--views/default/css/elements/buttons.php41
-rw-r--r--views/default/input/submit.php2
7 files changed, 33 insertions, 36 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>
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' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+ 'confirm' => elgg_echo('deleteconfirm'),
+ 'text_encode' => false,
));
- $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
}
$body = <<<HTML
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index bcf71f090..2dcf7fefd 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -35,10 +35,10 @@ if ($full_view) {
$url = "action/comments/delete?annotation_id=$comment->id";
$delete_button = elgg_view("output/confirmlink", array(
'href' => $url,
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm')
+ 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+ 'confirm' => elgg_echo('deleteconfirm'),
+ 'text_encode' => false,
));
- $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
}
$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' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+ 'confirm' => elgg_echo('deleteconfirm'),
+ 'text_encode' => false,
));
- $delete_button = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
}
$body = <<<HTML
diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php
index 71a54d5b1..7937af801 100644
--- a/views/default/css/elements/buttons.php
+++ b/views/default/css/elements/buttons.php
@@ -23,6 +23,9 @@
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
}
+a.elgg-button {
+ padding: 3px 6px;
+}
/* Submit: This button should convey, "you're about to take some definitive action" */
.elgg-button-submit {
@@ -56,7 +59,7 @@
border: 1px solid #999999;
}
.elgg-button-cancel:hover {
- color: white;
+ color: #444444;
background-color: #999999;
background-position: left 10px;
text-decoration: none;
@@ -95,28 +98,20 @@
/* Delete: This button should convey "be careful before you click me" */
.elgg-button-delete {
- width:14px;
- height:14px;
- margin:0;
- padding:0;
- border:0;
- float:right;
- -webkit-box-shadow: 0 0 0;
- -moz-box-shadow: 0 0 0;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
-}
-.elgg-button-delete a {
- display:block;
- cursor: pointer;
- width:14px;
- height:14px;
- background: url("<?php echo elgg_get_site_url(); ?>_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(<?php echo elgg_get_site_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