# HG changeset patch # User hamidouk # Date 1322057788 -3600 # Node ID 43a1b7d95317c601dbe1b1f0fa5334348d8a2beb # Parent a8b9e3b6e31cfcdd4459ff771260c134a675ee69 WIP - integrating the various changes samuel requested. diff -r a8b9e3b6e31c -r 43a1b7d95317 src/css/LdtPlayer.css --- a/src/css/LdtPlayer.css Wed Nov 23 12:25:10 2011 +0100 +++ b/src/css/LdtPlayer.css Wed Nov 23 15:16:28 2011 +0100 @@ -12,14 +12,7 @@ float:left; } - .Ldt-controler { - font-size: 62.5%; - font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; - background-color:#eeeeee; - height:35px; - } - - .Ldt-AnnotationsWidget { + .Ldt-AnnotationsWidget { font-size: 62.5%; font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; background-color:#eeeeee; @@ -138,9 +131,19 @@ display:none } + /* player */ + .Ldt-controler { + font-size: 62.5%; + font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; + background:url('imgs/player_gradient.png') repeat-x transparent ; + height: 27px; + border-top: 1px solid #b6b8b8; + border-bottom: 1px solid #b6b8b8; + } + + .Ldt-LeftPlayerControls { float:left; - padding: 4px; } .Ldt-RightPlayerControls { @@ -148,6 +151,34 @@ padding: 4px; } + .Ldt-CtrlPlay { + background:url('imgs/play_button.png') no-repeat scroll 0 0 transparent ; + background-position: center; + width: 50px; + height: 23px; + border: 1px solid #b6b8b8; + float: left; + } + + .Ldt-CtrlNext { + background:url('imgs/play_button.png') no-repeat scroll 0 0 transparent ; + background-position: center; + width: 50px; + height: 23px; + border: 1px solid #b6b8b8; + float: left; + } + + + .Ldt-CtrlSearch { + background:url('imgs/play_button.png') no-repeat scroll 0 0 transparent ; + background-position: center; + width: 50px; + height: 23px; + border: 1px solid #b6b8b8; + float: left; + } + .Ldt-Time { float: left; padding: 4px; diff -r a8b9e3b6e31c -r 43a1b7d95317 src/css/imgs/play_button.png Binary file src/css/imgs/play_button.png has changed diff -r a8b9e3b6e31c -r 43a1b7d95317 src/css/imgs/player_gradient.png Binary file src/css/imgs/player_gradient.png has changed diff -r a8b9e3b6e31c -r 43a1b7d95317 src/js/widgets/playerWidget.js --- a/src/js/widgets/playerWidget.js Wed Nov 23 12:25:10 2011 +0100 +++ b/src/js/widgets/playerWidget.js Wed Nov 23 15:16:28 2011 +0100 @@ -26,37 +26,15 @@ this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.timeDisplayUpdater)); - this.selector.find(".ldt-CtrlPlay").button({ - icons: { - primary: 'ui-icon-play' - }, - text: false - }).click(function() { self.playHandler.call(self); }) - .next().button({ - icons: { - primary: 'ui-icon-seek-next' - }, - text: false - }); + this.selector.find(".Ldt-CtrlPlay").click(function() { self.playHandler.call(self); }); + this.selector.find(".Ldt-CtrlNext").click(function() { }); + this.selector.find(".Ldt-CtrlSearch").click(function() { self.searchButtonHandler.call(self); }); - this.selector.find(".ldt-CtrlSearch").button({ - icons: { - primary: 'ui-icon-search'//, - //secondary: 'ui-icon-volume-off' - }, - text: false - }).click(function() { self.searchButtonHandler.call(self); }); + this.selector.find('.Ldt-CtrlSound').click(function() { self.muteHandler.call(self); } ); + + this.selector.find(".Ldt-CtrlPlay").attr( "style", "background-color:#CD21C24;" ); - this.selector.find('.ldt-CtrlSound').button({ - icons: { - primary: 'ui-icon-volume-on' - }, - text: false - }).click(function() { self.muteHandler.call(self); } ); - - this.selector.find(".ldt-CtrlPlay").attr( "style", "background-color:#CD21C24;" ); - - var searchButtonPos = this.selector.find(".ldt-CtrlSearch").position(); + var searchButtonPos = this.selector.find(".Ldt-CtrlSearch").position(); var searchBox = Mustache.to_html(IriSP.search_template, {margin_left : searchButtonPos.left + "px"}); this.selector.append(searchBox); @@ -95,10 +73,10 @@ if ( status == true ){ this.selector.find(".ui-icon-play").css( "background-position", "-16px -160px" ); - this.selector.find(".ldt-CtrlPlay").attr("title", "Play"); + this.selector.find(".Ldt-CtrlPlay").attr("title", "Play"); } else { this.selector.find(".ui-icon-play").css( "background-position","0px -160px" ); - this.selector.find(".ldt-CtrlPlay").attr("title", "Pause"); + this.selector.find(".Ldt-CtrlPlay").attr("title", "Pause"); } }; diff -r a8b9e3b6e31c -r 43a1b7d95317 src/templates/player.html --- a/src/templates/player.html Wed Nov 23 12:25:10 2011 +0100 +++ b/src/templates/player.html Wed Nov 23 15:16:28 2011 +0100 @@ -1,12 +1,9 @@ {{! template for the radio player }}