eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zach Copley 2009-12-14 07:34:33 +00:00
commit 0679ed4285
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/noticelist.php
View File

@ -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');
}
}

12
theme/base/css/display.css
View File

@ -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;

BIN
theme/base/images/icons/icons-01.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
theme/base/images/icons/twotone/green/recycle.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 87 B

4
theme/default/css/display.css
View File

@ -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 {

4
theme/identica/css/display.css
View File

@ -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 {