[Slim-Checkins] r12587 - in /trunk/server/HTML/Maestro: html/images/btn_pause_normal.png html/index.js html/main.js index.html pageheader.html slimserver.css status_header.html
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Fri Aug 17 00:52:18 PDT 2007
Author: mherger
Date: Fri Aug 17 00:52:17 2007
New Revision: 12587
URL: http://svn.slimdevices.com?rev=12587&view=rev
Log:
Bug: n/a
Description: refactor player control code
- allow control panel to be detached (open status_header.html)
- improve play/pause button behaviour
- add missing graphic
Added:
trunk/server/HTML/Maestro/html/images/btn_pause_normal.png (with props)
trunk/server/HTML/Maestro/html/main.js
- copied, changed from r12586, trunk/server/HTML/Maestro/html/index.js
trunk/server/HTML/Maestro/status_header.html
Removed:
trunk/server/HTML/Maestro/html/index.js
Modified:
trunk/server/HTML/Maestro/index.html
trunk/server/HTML/Maestro/pageheader.html
trunk/server/HTML/Maestro/slimserver.css
Added: trunk/server/HTML/Maestro/html/images/btn_pause_normal.png
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/images/btn_pause_normal.png?rev=12587&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/server/HTML/Maestro/html/images/btn_pause_normal.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/server/HTML/Maestro/html/images/btn_pause_normal.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: trunk/server/HTML/Maestro/html/main.js (from r12586, trunk/server/HTML/Maestro/html/index.js)
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/main.js?p2=trunk/server/HTML/Maestro/html/main.js&p1=trunk/server/HTML/Maestro/html/index.js&r1=12586&r2=12587&rev=12587&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/html/index.js (original)
+++ trunk/server/HTML/Maestro/html/main.js Fri Aug 17 00:52:17 2007
@@ -1,22 +1,6 @@
Main = function(){
- var pollTimer;
-
- var playerStatus = {
- power: null,
- modus: null,
- title: null,
- track: null
- };
-
return {
init : function(){
- Ext.Ajax.method = 'POST';
- Ext.Ajax.url = '/jsonrpc.js';
- Ext.Ajax.timeout = 4000;
-
- pollTimer = new Ext.util.DelayedTask(Main.getStatus, this);
- this.getStatus();
-
var layout = new Ext.BorderLayout('mainbody', {
north: {
split:false,
@@ -62,9 +46,32 @@
Ext.get('rightpanel').setHeight(colHeight - 155);
this.layout();
- },
-
-
+ }
+ };
+}();
+
+
+Player = function(){
+ var pollTimer;
+
+ var playerStatus = {
+ power: null,
+ modus: null,
+ title: null,
+ track: null,
+ volume: null
+ };
+
+ return {
+ init : function(){
+ Ext.Ajax.method = 'POST';
+ Ext.Ajax.url = '/jsonrpc.js';
+ Ext.Ajax.timeout = 4000;
+
+ pollTimer = new Ext.util.DelayedTask(Player.getStatus, this);
+ this.getStatus();
+ },
+
updateStatus : function(response) {
if (response && response.responseText) {
@@ -103,7 +110,8 @@
power: result.power,
mode: result.mode,
title: result.current_title,
- track: result.playlist_loop[0].url
+ track: result.playlist_loop[0].url/*,
+ volume: result.'mixer volume'*/
};
}
@@ -207,8 +215,15 @@
ctrlNext : function(){ this.playerControl(['playlist', 'index', '+1']) },
ctrlPrevious : function(){ this.playerControl(['playlist', 'index', '-1']) },
- ctrlTogglePause : function(){ this.playerControl(['pause']) }
-
- };
-}();
-Ext.EventManager.onDocumentReady(Main.init, Main, true);
+ ctrlTogglePlay : function(){
+ if (playerStatus.power == '0' || playerStatus.mode == 'stop')
+ this.playerControl(['play']);
+ else
+ this.playerControl(['pause']);
+ },
+
+ openPlayerControl : function(){
+ window.open(webroot + 'status_header.html', "gaasd", "width=500,height=165");
+ }
+ }
+}();
Modified: trunk/server/HTML/Maestro/index.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/index.html?rev=12587&r1=12586&r2=12587&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/index.html (original)
+++ trunk/server/HTML/Maestro/index.html Fri Aug 17 00:52:17 2007
@@ -49,7 +49,11 @@
.current_track_exp { color: white; font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; padding-left: 6px; }
</style>
- <script type="text/javascript" src="[% webroot %]html/index.js"></script>
+ <script type="text/javascript" src="[% webroot %]html/main.js"></script>
+ <script type="text/javascript">
+ Ext.EventManager.onDocumentReady(Main.init, Main, true);
+ </script>
+
</head>
<body>
@@ -78,76 +82,7 @@
<td height="163">
<div id="playerControlPanel">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="6"><img src="[% webroot %]html/images/playerbase_exp_left.png" alt="" height="143" width="6" border="0" /></td>
- <td background="[% webroot %]html/images/playerbase_std_mid.png">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td><img src="[% webroot %]html/images/btn_previous_normal.png" alt="" height="22" width="28" border="0" onclick="Main.ctrlPrevious();" /></td>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
- <td id="ctrlMode" onclick="Main.ctrlTogglePause();"><img src="[% webroot %]html/images/btn_play_normal.png" alt="" height="22" width="51" border="0" /></td>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
- <td><img src="[% webroot %]html/images/btn_next_normal.png" alt="" height="22" width="28" border="0" onclick="Main.ctrlNext();" /></td>
- </tr>
- </table>
- </td>
- <td align="center"><img src="[% webroot %]html/images/btn_repeat_normal.png" alt="" height="22" width="34" border="0" /></td>
- <td align="center"><img src="[% webroot %]html/images/btn_shuffle_normal.png" alt="" height="22" width="34" border="0" /></td>
- <td align="right">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td><img src="[% webroot %]html/images/btn_volume_low_normal.png" alt="" height="22" width="22" border="0" /></td>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
- <td><img src="[% webroot %]html/images/level_5.png" alt="" height="22" width="57" border="0" /></td>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
- <td><img src="[% webroot %]html/images/btn_volume_hi_normal.png" alt="" height="22" width="22" border="0" /></td>
- </tr>
- </table>
- </td>
- <td align="right"><img src="[% webroot %]html/images/btn_power_normal.png" alt="" height="24" width="24" border="0" /></td>
- </tr>
- <tr>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="8" width="32" border="0" /></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td colspan="4">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td rowspan="6" width="96" id="ctrlCurrentArt"><img src="[% webroot %]music/0/cover_96x96.jpg" alt="" height="96" width="96" border="0" /></td>
- <td class="section_header" id="ctrlCurrentTitle"></td>
- </tr>
- <tr>
- <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="12" width="12" border="0" /></td>
- </tr>
- <tr>
- <td class="current_track_exp">[% "ARTIST" | string %][% "COLON" | string %] <span id="ctrlCurrentArtist">Audioslave</span></td>
- </tr>
- <tr>
- <td class="current_track_exp">[% "ALBUM" | string %][% "COLON" | string %] <span id="ctrlCurrentAlbum">Audioslave</span></td>
- </tr>
- <tr>
- <td class="current_track_exp" id="ctrlPlaytime"><!-- 4:32 --> </td>
- </tr>
- <tr>
- <td class="current_track_exp"><!-- [% "SONG" | string %][% "COLON" | string %] <span id="ctrlCurrentSong">Gasoline</span> --> </td>
- </tr>
- </table>
- </td>
- <td align="right" valign="top"><img src="[% webroot %]html/images/toggle_player_std.png" alt="" height="14" width="24" border="0" /></td>
- </tr>
- </table>
- </td>
- <td align="right" width="6"><img src="[% webroot %]html/images/playerbase_exp_right.png" alt="" height="143" width="6" border="0" /></td>
- </tr>
- </table>
+ [% PROCESS status_header.html embedded=1 %]
</div>
Modified: trunk/server/HTML/Maestro/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/pageheader.html?rev=12587&r1=12586&r2=12587&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/pageheader.html (original)
+++ trunk/server/HTML/Maestro/pageheader.html Fri Aug 17 00:52:17 2007
@@ -7,7 +7,7 @@
[% IF maestroScripts %]
<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
<script type="text/javascript" src="/html/ext/ext-all.js"></script>
- <script TYPE="text/javascript">[% PROCESS html/vars.js %]</script>
+ <script type="text/javascript">[% PROCESS html/vars.js %]</script>
<script type="text/javascript">
var Tools = function(){
Modified: trunk/server/HTML/Maestro/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/slimserver.css?rev=12587&r1=12586&r2=12587&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/slimserver.css (original)
+++ trunk/server/HTML/Maestro/slimserver.css Fri Aug 17 00:52:17 2007
@@ -63,7 +63,7 @@
margin: 0;
margin-right: 10px;
padding: 5px;
- font-size: 120%;
+/* font-size: 120%;*/
}
.homeMenuItem a {
Added: trunk/server/HTML/Maestro/status_header.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/status_header.html?rev=12587&view=auto
==============================================================================
--- trunk/server/HTML/Maestro/status_header.html (added)
+++ trunk/server/HTML/Maestro/status_header.html Fri Aug 17 00:52:17 2007
@@ -1,0 +1,106 @@
+[%- IF !embedded %]
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ [% PROCESS standardheader.html %]
+
+ <script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
+ <script type="text/javascript" src="/html/ext/ext-all.js"></script>
+ <script type="text/javascript">[% PROCESS html/vars.js %]</script>
+
+ <style>
+ html, body {
+ background: white;
+ }
+
+ body {
+ margin: 10px;
+ }
+ </style>
+
+ <!--[if gte IE 6]>
+ <link href="[% webroot %]ie.css" type="text/css" rel="stylesheet">
+ <![endif]-->
+ </head>
+ <body>
+ <div class="content">
+[% END %]
+
+<script type="text/javascript" src="[% webroot %]html/main.js"></script>
+<script type="text/javascript">
+ Ext.EventManager.onDocumentReady(Player.init, Player, true);
+</script>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="6"><img src="[% webroot %]html/images/playerbase_exp_left.png" alt="" height="143" width="6" border="0" /></td>
+ <td background="[% webroot %]html/images/playerbase_std_mid.png">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><img src="[% webroot %]html/images/btn_previous_normal.png" alt="" height="22" width="28" border="0" onclick="Player.ctrlPrevious();" /></td>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
+ <td id="ctrlMode" onclick="Player.ctrlTogglePlay();"><img src="[% webroot %]html/images/btn_play_normal.png" alt="" height="22" width="51" border="0" /></td>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
+ <td><img src="[% webroot %]html/images/btn_next_normal.png" alt="" height="22" width="28" border="0" onclick="Player.ctrlNext();" /></td>
+ </tr>
+ </table>
+ </td>
+ <td align="center"><img src="[% webroot %]html/images/btn_repeat_normal.png" alt="" height="22" width="34" border="0" /></td>
+ <td align="center"><img src="[% webroot %]html/images/btn_shuffle_normal.png" alt="" height="22" width="34" border="0" /></td>
+ <td align="right">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td><img src="[% webroot %]html/images/btn_volume_low_normal.png" alt="" height="22" width="22" border="0" /></td>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
+ <td><img src="[% webroot %]html/images/level_5.png" alt="" height="22" width="57" border="0" /></td>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="10" width="5" border="0" /></td>
+ <td><img src="[% webroot %]html/images/btn_volume_hi_normal.png" alt="" height="22" width="22" border="0" /></td>
+ </tr>
+ </table>
+ </td>
+ <td align="right"><img src="[% webroot %]html/images/btn_power_normal.png" alt="" height="24" width="24" border="0" /></td>
+ </tr>
+ <tr>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="8" width="32" border="0" /></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td rowspan="6" width="96" id="ctrlCurrentArt"><img src="[% webroot %]music/0/cover_96x96.jpg" alt="" height="96" width="96" border="0" /></td>
+ <td class="section_header" id="ctrlCurrentTitle"></td>
+ </tr>
+ <tr>
+ <td><img src="[% webroot %]html/images/spacer.gif" alt="" height="12" width="12" border="0" /></td>
+ </tr>
+ <tr>
+ <td class="current_track_exp">[% "ARTIST" | string %][% "COLON" | string %] <span id="ctrlCurrentArtist"> </span></td>
+ </tr>
+ <tr>
+ <td class="current_track_exp">[% "ALBUM" | string %][% "COLON" | string %] <span id="ctrlCurrentAlbum"> </span></td>
+ </tr>
+ <tr>
+ <td class="current_track_exp" id="ctrlPlaytime"><!-- 4:32 --> </td>
+ </tr>
+ <tr>
+ <td class="current_track_exp"><!-- [% "SONG" | string %][% "COLON" | string %] <span id="ctrlCurrentSong">Gasoline</span> --> </td>
+ </tr>
+ </table>
+ </td>
+ <td align="right" valign="top" onclick="Player.openPlayerControl();"><img src="[% webroot %]html/images/toggle_player_std.png" alt="" height="14" width="24" border="0" /></td>
+ </tr>
+ </table>
+ </td>
+ <td align="right" width="6"><img src="[% webroot %]html/images/playerbase_exp_right.png" alt="" height="143" width="6" border="0" /></td>
+ </tr>
+</table>
+
+[% IF !embedded; PROCESS pagefooter.html; END %]
More information about the checkins
mailing list