Merge ../csarven into uiredesign

6 files changed, 26 insertions, 19 deletions

diff --git a/lib/favorform.php b/lib/favorform.php
index 4f4fd72a9..977f19183 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -103,6 +103,18 @@ class FavorForm extends Form
                            common_session_token());
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Delete this notice'));
+    }
+
+
     /**
      * Data elements
      *
@@ -125,7 +137,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Make a favorite'));
+                           _('Favorite'));
     }
     
     /**
@@ -136,6 +148,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-	return 'favor';
+	return 'notice_favorite';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 75a995bef..eb8a612e4 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -324,13 +324,11 @@ class HTMLOutputter extends XMLOutputter
 
     function submit($id, $label, $cls='submit', $name=null)
     {
-        $this->elementStart('p');
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
                                       'value' => $label));
-        $this->elementEnd('p');
     }
 
     /**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6f4d1c04e..fde93a3b6 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -438,16 +438,13 @@ class NoticeListItem extends Widget
         $reply_url = common_local_url('newnotice',
                                       array('replyto' => $this->profile->nickname));
 
-        $reply_js =
-          'return doreply("'.$this->profile->nickname.'",'.$this->notice->id.');';
-
-        $this->out->elementStart('a',
-                             array('href' => $reply_url,
-                                   'onclick' => $reply_js,
-                                   'title' => _('reply'),
-                                   'class' => 'replybutton'));
-        $this->out->raw(' →');
-        $this->out->elementEnd('a');
+        $this->out->elementStart('dl', 'reply');
+        $this->out->element('dt', null, _('Reply to this notice'));
+        $this->out->elementStart('dd');
+        $this->out->element('a', array('href' => $reply_url,
+                                       'title' => _('reply')), _('Reply'));
+        $this->out->elementEnd('dd');
+        $this->out->elementEnd('dl');
     }
 
     /**
diff --git a/lib/util.php b/lib/util.php
index 8c6cddbd9..9ca817eab 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -571,7 +571,7 @@ function common_tag_link($tag)
 {
     $canonical = common_canonical_tag($tag);
     $url = common_local_url('tag', array('tag' => $canonical));
-    return '<a href="' . htmlspecialchars($url) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
+    return '<span class="tag"><a href="' . htmlspecialchars($url) . '" rel="tag">' . htmlspecialchars($tag) . '</a></span>';
 }
 
 function common_canonical_tag($tag)
@@ -589,7 +589,7 @@ function common_at_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
     if ($recipient) {
-        return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a>';
+        return '<span class="vcard"><a href="'.htmlspecialchars($recipient->profileurl).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
     } else {
         return $nickname;
     }
@@ -606,7 +606,7 @@ function common_at_hash_link($sender_id, $tag)
         $url = common_local_url('subscriptions',
                                 array('nickname' => $user->nickname,
                                       'tag' => $tag));
-        return '<a href="'.htmlspecialchars($url).'" class="atlink">'.$tag.'</a>';
+        return '<span class="tag"><a href="'.htmlspecialchars($url).'" rel="tag">'.$tag.'</a></span>';
     } else {
         return $tag;
     }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 4f2ba4652..7e0c6d7b4 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -180,7 +180,7 @@ color:#333333;
 border-bottom-color:#ccc;
 }
 .notice-options .reply a {
-background:transparent url(../images/icons/twotone/green/undo.gif) no-repeat 0 45%;
+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%;
diff --git a/theme/identica/images/icons/twotone/green/reply.gif b/theme/identica/images/icons/twotone/green/reply.gif
new file mode 100644
index 000000000..6ff01bb35
--- /dev/null
+++ b/theme/identica/images/icons/twotone/green/reply.gif