Updated 'more' anchor for attachments to do an XHR GET

Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
This commit is contained in:
Brion Vibber
2010-03-25 14:15:54 -07:00
parent 7fc8b6af4a
commit c11064a539
6 changed files with 140 additions and 54 deletions

View File

@@ -1284,9 +1284,16 @@ height:16px;
position:relative;
padding-left:16px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
padding-left:0;
}
.notice .attachment.more:before {
content:'( ';
}
.notice .attachment.more:after {
content:' )';
}
.notice .attachment img {
position:absolute;
top:18px;

View File

@@ -410,7 +410,8 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
background:none;
}
.notice-options .notice_reply {

View File

@@ -409,7 +409,8 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
background:none;
}
.notice-options .notice_reply {