summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-18 17:59:44 +0000
committerSarven Capadisli <csarven@status.net>2009-11-18 17:59:44 +0000
commitc1efb8aa7fc429c6885cb6337e141e32847d34e9 (patch)
tree5e0cece7f3ae0b2c4064c4f3eff20f9bcbd0b24c
parentef542afbe5f6aec04f7c72d71fb613265e794f95 (diff)
Took out CSS from JS and placed it in its own file.
-rw-r--r--plugins/Realtime/RealtimePlugin.php7
-rw-r--r--plugins/Realtime/realtimeupdate.css49
-rw-r--r--plugins/Realtime/realtimeupdate.js52
3 files changed, 56 insertions, 52 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 6d59bd1b1..2cff03d6c 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -118,6 +118,13 @@ class RealtimePlugin extends Plugin
return true;
}
+ function onEndShowStatusNetStyles($action)
+ {
+ $action->cssLink(common_path('plugins/Realtime/realtimeupdate.css'),
+ null, 'screen, projection, tv');
+ return true;
+ }
+
function onEndNoticeSave($notice)
{
$paths = array();
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
new file mode 100644
index 000000000..0ab5dd32b
--- /dev/null
+++ b/plugins/Realtime/realtimeupdate.css
@@ -0,0 +1,49 @@
+#notices_primary {
+position:relative;
+}
+
+#realtime_actions {
+position: absolute;
+top: -20px;
+right: 0;
+margin: 0 0 11px 0;
+}
+
+#realtime_actions li {
+margin-left: 18px;
+list-style-type: none;
+float: left;
+}
+
+#realtime_actions button {
+width: 16px;
+height: 16px;
+display: block;
+border: none;
+cursor: pointer;
+text-indent: -9999px;
+float: left;
+}
+
+#realtime_play {
+background: url(icon_play.gif) no-repeat 47% 47%;
+margin-left: 4px;
+}
+
+#realtime_pause {
+background: url(icon_pause.gif) no-repeat 47% 47%;
+}
+
+#realtime_popup {
+background: url(icon_external.gif) no-repeat 0 30%;
+}
+
+#queued_counter {
+float:left;
+line-height:1.2;
+}
+
+#showstream #notices_primary {
+margin-top: 18px;
+}
+
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 8e3052dfc..9030ad551 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -195,20 +195,6 @@ RealtimeUpdate = {
{
var NP = $('#notices_primary');
NP.prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');
- NP.css({'position':'relative'});
-
- $('#realtime_actions').css({
- 'position':'absolute',
- 'top':'-20px',
- 'right':'0',
- 'margin':'0 0 11px 0'
- });
-
- $('#realtime_actions li').css({
- 'margin-left':'18px',
- 'list-style-type':'none',
- 'float':'left'
- });
RealtimeUpdate._pluginPath = path;
@@ -228,16 +214,6 @@ RealtimeUpdate = {
RT_PP.append('<button id="realtime_pause" class="pause" title="Pause">Pause</button>');
RT_P = $('#realtime_pause');
- $('#realtime_pause').css({
- 'background':'url('+RealtimeUpdate._pluginPath+'icon_pause.gif) no-repeat 47% 47%',
- 'width':'16px',
- 'height':'16px',
- 'display':'block',
- 'border':'none',
- 'cursor':'pointer',
- 'text-indent':'-9999px',
- 'float':'left'
- });
RT_P.bind('click', function() {
RealtimeUpdate._paused = true;
@@ -252,23 +228,7 @@ RealtimeUpdate = {
RT_PP.empty();
RT_PP.append('<span id="queued_counter"></span> <button id="realtime_play" class="play" title="Play">Play</button>');
- $('#queued_counter').css({
- 'float':'left',
- 'line-height':'1.2'
- });
-
RT_P = $('#realtime_play');
- RT_P.css({
- 'background':'url('+RealtimeUpdate._pluginPath+'icon_play.gif) no-repeat 47% 47%',
- 'width':'16px',
- 'height':'16px',
- 'display':'block',
- 'border':'none',
- 'cursor':'pointer',
- 'text-indent':'-9999px',
- 'float':'left',
- 'margin-left':'4px'
- });
RT_P.bind('click', function() {
RealtimeUpdate._paused = false;
@@ -307,18 +267,6 @@ RealtimeUpdate = {
NP.append('<button id="realtime_popup" title="Pop up in a window">Pop up</button>');
var PP = $('#realtime_popup');
- PP.css({
- 'background':'transparent url('+ path + 'icon_external.gif) no-repeat 0 30%',
- 'width':'16px',
- 'height':'16px',
- 'display':'block',
- 'border':'none',
- 'cursor':'pointer',
- 'text-indent':'-9999px',
- 'float':'left'
- });
- $('#showstream #notices_primary').css({'margin-top':'18px'});
-
PP.bind('click', function() {
window.open(url,
'',