]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89cb69c)
cleared up confusion over elgg-icon-delete and elgg-button-delete
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 5 Mar 2011 22:29:24 +0000 (22:29 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 5 Mar 2011 22:29:24 +0000 (22:29 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8594 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/messages/views/default/forms/messages/process.php patch | blob | history
mod/messages/views/default/object/messages.php patch | blob | history
views/default/annotation/default.php patch | blob | history
views/default/annotation/generic_comment.php patch | blob | history
views/default/annotation/likes.php patch | blob | history
views/default/css/elements/buttons.php patch | blob | history
views/default/input/submit.php patch | blob | history

diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 5cdd01c1fb2f61d29aaa13528ecee3598ee63ab6..e415a092b40896dffd85ff4a76016a070a3d8c38 100644 (file)
--- 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 70a51bf57c8e7f99403dada55f2b8229a0f8e03f..1c97c8e36fa9fece424d39d6fac5c19dd403579e 100644 (file)
--- 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 acad271f75714dfdc419024250ec7dee024dfda5..a21fdee51fbc41cec1677ce679eee97402020c34 100644 (file)
--- 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 bcf71f0901ee0fffaf326711872ee8194d38c243..2dcf7fefd100a9f5142519db844f4348fe844860 100644 (file)
--- 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 2d6a2fec5db8ef8fa643a1bf1ee0120273501ec2..e1ae20818445e4267aff7c45be504fe5b12f2a97 100644 (file)
--- 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 71a54d5b12cf41d68d52966abc22beedb005a65d..7937af8012e147531d42b85b223c6b93b6eb6f3c 100644 (file)
--- 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 31efa5cbfdeb461ea9b496b9cb0110b95e923e7b..64b135afac24308e110d704a515417d17a89f43b 100644 (file)
--- 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
Social Networking Engine