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

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index e30c4115676b3740205af9caec39936a7b1c03eb..0f0d0f9f42309b134298220d3fc1d148e3ae2ed7 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -216,8 +216,6 @@ class RealtimePlugin extends Plugin
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
 
-        $action->elementStart('div', array('id' => 'header'));
-
         // XXX hack to deal with JS that tries to get the
         // root url from page output
 
@@ -230,7 +228,6 @@ class RealtimePlugin extends Plugin
         if (common_logged_in()) {
             $action->showNoticeForm();
         }
-        $action->elementEnd('div');
 
         $action->showContentBlock();
         $action->elementEnd('body');

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index a31565177fe3f1b04646de996f92904fd0dcbc9b..015c004397788d342a0aac4652a85f5f4020dbd7 100644 (file)
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -27,7 +27,7 @@ RealtimeUpdate = {
           }
 
           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").fadeIn(1000);
           NoticeReply();
@@ -114,7 +114,7 @@ RealtimeUpdate = {
      addPopup: function(url, timeline, iconurl)
      {
          $('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>');
- 
+
          $('#realtime_timeline').css({
              'margin':'0 0 18px 0',
              'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
@@ -127,21 +127,38 @@ RealtimeUpdate = {
              'font-weight':'bold',
              'font-size':'1em'
          });
- 
+
          $('#realtime_timeline').click(function() {
              window.open(url,
                          timeline,
                          'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
- 
+
              return false;
          });
      },
 
      initPopupWindow: function()
      {
-         window.resizeTo(575, 640);
+         window.resizeTo(500, 550);
          $('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'
+         });
      }
 }
 

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1f37a7637bc8e69ab5fc3ce4a0caad5ab119a0c1..7706fba4845b58ab59daeec51e070eb58d296d7f 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -484,7 +484,7 @@ height:16px;
 #form_notice .form_note {
 position:absolute;
 bottom:2px;
-right:98px;
+right:21.715%;
 z-index:9;
 }
 #form_notice .form_note dt {