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

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

Browse Source
This commit is contained in:
Sarven Capadisli 2009-09-27 15:04:38 +02:00
commit fc682ecede
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Realtime/RealtimePlugin.php
View File

@ -216,8 +216,6 @@ class RealtimePlugin extends Plugin
'class' => 'user_in') 'class' => 'user_in')
: array('id' => $action->trimmed('action'))); : array('id' => $action->trimmed('action')));
$action->elementStart('div', array('id' => 'header'));
// XXX hack to deal with JS that tries to get the // XXX hack to deal with JS that tries to get the
// root url from page output // root url from page output
@ -230,7 +228,6 @@ class RealtimePlugin extends Plugin
if (common_logged_in()) { if (common_logged_in()) {
$action->showNoticeForm(); $action->showNoticeForm();
} }
$action->elementEnd('div');
$action->showContentBlock(); $action->showContentBlock();
$action->elementEnd('body'); $action->elementEnd('body');

29
plugins/Realtime/realtimeupdate.js
View File

@ -27,7 +27,7 @@ RealtimeUpdate = {
} }
var noticeItem = RealtimeUpdate.makeNoticeItem(data); var noticeItem = RealtimeUpdate.makeNoticeItem(data);
$("#notices_primary .notices").prepend(noticeItem, true); $("#notices_primary .notices").prepend(noticeItem);
$("#notices_primary .notice:first").css({display:"none"}); $("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(1000); $("#notices_primary .notice:first").fadeIn(1000);
NoticeReply(); NoticeReply();
@ -114,7 +114,7 @@ RealtimeUpdate = {
addPopup: function(url, timeline, iconurl) addPopup: function(url, timeline, iconurl)
{ {
$('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>'); $('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>');
$('#realtime_timeline').css({ $('#realtime_timeline').css({
'margin':'0 0 18px 0', 'margin':'0 0 18px 0',
'background':'transparent url('+ iconurl + ') no-repeat 0% 30%', 'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
@ -127,21 +127,38 @@ RealtimeUpdate = {
'font-weight':'bold', 'font-weight':'bold',
'font-size':'1em' 'font-size':'1em'
}); });
$('#realtime_timeline').click(function() { $('#realtime_timeline').click(function() {
window.open(url, window.open(url,
timeline, timeline,
'toolbar=no,resizable=yes,scrollbars=yes,status=yes'); 'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
return false; return false;
}); });
}, },
initPopupWindow: function() initPopupWindow: function()
{ {
window.resizeTo(575, 640); window.resizeTo(500, 550);
$('address').hide(); $('address').hide();
$('#content').css({'width':'92%'}); $('#content').css({'width':'93.5%'});
$('#form_notice').css({
'margin':'18px 0 18px 1.795%',
'width':'93%',
'max-width':'451px'
});
$('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
$('.notices li:first-child').css({'border-top':'none'});
$('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
$('#form_notice #notice_data-attach').css({
'left':'auto',
'right':'0'
});
} }
} }

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

@ -484,7 +484,7 @@ height:16px;
#form_notice .form_note { #form_notice .form_note {
position:absolute; position:absolute;
bottom:2px; bottom:2px;
right:98px; right:21.715%;
z-index:9; z-index:9;
} }
#form_notice .form_note dt { #form_notice .form_note dt {