Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

6 files changed, 24 insertions, 7 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index aa6ea278c..a106478ed 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -535,17 +535,19 @@ class NoticeListItem extends Widget
 
             $repeater = Profile::staticGet('id', $this->repeat->profile_id);
 
-            $attrs = array('href' => $repeater->profileurl,
+            $attrs = array('href' => $this->profile->profileurl,
                            'class' => 'url');
 
             if (!empty($repeater->fullname)) {
                 $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
             }
 
-            $this->out->elementStart('span', 'repeat');
+            $this->out->elementStart('span', 'repeat vcard');
 
             $this->out->elementStart('a', $attrs);
 
+            $this->out->raw(_('Repeated by'));
+
             $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
 
             $this->out->element('img', array('src' => ($avatar) ?
@@ -559,12 +561,9 @@ class NoticeListItem extends Widget
                                              $repeater->fullname :
                                              $repeater->nickname));
 
+            $this->out->element('span', 'nickname', $repeater->nickname);
             $this->out->elementEnd('a');
 
-            $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname);
-
-            $this->out->raw(sprintf(_('Repeated by %s'), $text_link));
-
             $this->out->elementEnd('span');
         }
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7446a42cd..0173d2fbb 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -982,6 +982,17 @@ font-size:1.025em;
 display:inline-block;
 }
 
+.entry-content .repeat {
+display:block;
+}
+.entry-content .repeat .photo {
+float:none;
+margin-right:1px;
+position:relative;
+top:4px;
+left:0;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;
@@ -1000,7 +1011,6 @@ float:left;
 float:left;
 margin-left:20%;
 }
-.notice-options .form_repeat,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 margin-left:0;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index e910c86c0..5909d7b19 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/twotone/green/recycle.gif b/theme/base/images/icons/twotone/green/recycle.gif
new file mode 100644
index 000000000..1fab5dcc7
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/recycle.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d4fcb2343..e0dda3de2 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -160,6 +160,7 @@ opacity:0;
 .notice-options form.form_favor input.submit,
 .notice-options form.form_disfavor input.submit,
 .notice-options .notice_delete,
+.notice-options form.form_repeat input.submit,
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
@@ -334,6 +335,9 @@ background-position:0 -526px;
 .notice-options .notice_delete {
 background-position:0 -658px;
 }
+.notice-options form.form_repeat input.submit {
+background-position:0 -1582px;
+}
 
 .notices div.entry-content,
 .notices div.notice-options {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0e8fa6d79..999af973c 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -160,6 +160,7 @@ opacity:0;
 .notice-options form.form_favor input.submit,
 .notice-options form.form_disfavor input.submit,
 .notice-options .notice_delete,
+.notice-options form.form_repeat input.submit,
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
@@ -333,6 +334,9 @@ background-position:0 -526px;
 .notice-options .notice_delete {
 background-position:0 -658px;
 }
+.notice-options form.form_repeat input.submit {
+background-position:0 -1582px;
+}
 
 .notices div.entry-content,
 .notices div.notice-options {