Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
This commit is contained in:
commit
ad1f2aac03
@ -280,13 +280,13 @@ function NoticeAttachments() {
|
||||
timeout : 0
|
||||
};
|
||||
|
||||
$('a.attachment').click(function() {
|
||||
$('#content .notice a.attachment').click(function() {
|
||||
$().jOverlay({url: $('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
|
||||
return false;
|
||||
});
|
||||
|
||||
var t;
|
||||
$("body:not(#shownotice) a.thumbnail").hover(
|
||||
$("body:not(#shownotice) #content .notice a.thumbnail").hover(
|
||||
function() {
|
||||
var anchor = $(this);
|
||||
$("a.thumbnail").children('img').hide();
|
||||
|
@ -82,7 +82,8 @@ class AttachmentList extends Widget
|
||||
$atts = new File;
|
||||
$att = $atts->getAttachments($this->notice->id);
|
||||
if (empty($att)) return 0;
|
||||
$this->out->elementStart('dl', array('id' =>'attachments'));
|
||||
$this->out->elementStart('dl', array('id' =>'attachments',
|
||||
'class' => 'entry-content'));
|
||||
$this->out->element('dt', null, _('Attachments'));
|
||||
$this->out->elementStart('dd');
|
||||
$this->out->elementStart('ol', array('class' => 'attachments'));
|
||||
|
@ -548,7 +548,8 @@ margin-bottom:18px;
|
||||
.entity_profile .entity_location,
|
||||
.entity_profile .entity_url,
|
||||
.entity_profile .entity_note,
|
||||
.entity_profile .entity_tags {
|
||||
.entity_profile .entity_tags,
|
||||
.entity_profile .entity_aliases {
|
||||
margin-left:113px;
|
||||
margin-bottom:4px;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user