From 607e65be81d6b42990706884f96fa024301c7893 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 02:32:13 +0000
Subject: [PATCH] Delete notice markup and styles

---
 lib/noticelist.php             | 14 ++++++++------
 theme/base/css/display.css     | 17 +++++++++--------
 theme/identica/css/display.css |  6 +++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index fde93a3b66..1283e43e4a 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -438,7 +438,7 @@ class NoticeListItem extends Widget
         $reply_url = common_local_url('newnotice',
                                       array('replyto' => $this->profile->nickname));
 
-        $this->out->elementStart('dl', 'reply');
+        $this->out->elementStart('dl', 'notice_reply');
         $this->out->element('dt', null, _('Reply to this notice'));
         $this->out->elementStart('dd');
         $this->out->element('a', array('href' => $reply_url,
@@ -459,11 +459,13 @@ class NoticeListItem extends Widget
         if ($user && $this->notice->profile_id == $user->id) {
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));
-            $this->out->elementStart('a', array('class' => 'deletenotice',
-                                            'href' => $deleteurl,
-                                            'title' => _('delete')));
-            $this->out->raw(' &#215;');
-            $this->out->elementEnd('a');
+            $this->out->elementStart('dl', 'notice_delete');
+            $this->out->element('dt', null, _('Delete this notice'));
+            $this->out->elementStart('dd');
+            $this->out->element('a', array('href' => $deleteurl,
+                                           'title' => _('delete')), _('Delete'));
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fb7e71acd4..20e66c3519 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -775,25 +775,26 @@ outline:none;
 margin-left:2%;
 float:left;
 }
-.notice-options .reply,
+.notice-options .notice_reply,
 .notice-options .notice_delete ,
 .notice-options .notice_favorite {
 float:left;
 margin-right:11px;
 }
-.notice-options .reply {
+.notice-options .notice_reply {
 margin-top:1px;
 }
-.notice-options .reply dt {
+.notice-options .notice_reply dt {
 display:none;
 }
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;
 border:0;
 }
 
-.notice-options .reply a {
+.notice-options .notice_reply a,
+.notice-options .notice_delete a {
 text-decoration:none;
 padding-left:20px;
 }
@@ -802,7 +803,7 @@ cursor:pointer;
 padding:0 0 0 17px;
 }
 
-.notice-options .notice_delete legend,
+.notice-options .notice_delete dt,
 .notice-options .notice_favorite legend {
 display:none;
 }
@@ -813,8 +814,8 @@ padding:0;
 }
 
 
-.notice-options form.notice_delete {
-margin-left:2em;
+.notice-options .notice_delete {
+margin-left:3em;
 }
 /*END: NOTICES */
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index aed4f95e50..94e97d4148 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -173,17 +173,17 @@ background-image:url(../images/icons/twotone/green/flag.gif);
 background-image:url(../images/icons/twotone/green/document.gif);
 }
 
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
 }
-.notice-options .reply a {
+.notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.notice_favorite input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_delete input.submit {
+.notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }