diff --git a/resources/css/player.css b/resources/css/player.css index bfff9c2..eb519bb 100644 --- a/resources/css/player.css +++ b/resources/css/player.css @@ -1,5 +1,5 @@ -body > div.ui-layout-north #daaprPlayerViewport { +body > div.ui-layout-north > div:last-child { margin: 6px auto 0 auto; background: transparent url('../img/player_background.png') repeat-x; height: 40px; @@ -13,7 +13,7 @@ body > div.ui-layout-north #daaprPlayerViewport { z-index: 10; } -body > div.ui-layout-north #daaprPlayerViewport h1 { +body > div.ui-layout-north > div:last-child > h1 { color: #5F5F5F; font-size: 2em; font-style: oblique; diff --git a/resources/js/views/player.js b/resources/js/views/player.js index 98d6d41..1b09403 100644 --- a/resources/js/views/player.js +++ b/resources/js/views/player.js @@ -10,6 +10,7 @@ define([ , "backbone" , "text!../../templates/player/layout.html" + , "text!../../templates/player/player-status.html" ] , function ( _ @@ -17,6 +18,7 @@ _ , Backbone , tmplPlayerLayout +, tmplPlayerStatus ) { "use strict"; @@ -35,6 +37,8 @@ _ that.$el.html(tmplPlayerLayout); + that.$el.find("div:last").html(_.template(tmplPlayerStatus)({})); + return that; } @@ -44,6 +48,30 @@ _ } + , __buttonPlayPause: function (event) { + + } + + , __buttonNext: function (event) { + + } + + , __buttonPrevious: function (event) { + + } + + , __buttonVolumeUp: function (event) { + + } + + , __buttonVolumeDown: function (event) { + + } + + , __buttonVolumeClick: function (event) { + + } + , _createWebAudio: function () { var that = this ; diff --git a/resources/templates/player/layout.html b/resources/templates/player/layout.html index ec0ce12..dc24b7a 100644 --- a/resources/templates/player/layout.html +++ b/resources/templates/player/layout.html @@ -15,6 +15,4 @@ -
-

DAAPr3

-
\ No newline at end of file +
\ No newline at end of file diff --git a/resources/templates/player/player-status.html b/resources/templates/player/player-status.html index 5c4dbab..63862f6 100644 --- a/resources/templates/player/player-status.html +++ b/resources/templates/player/player-status.html @@ -1,7 +1,11 @@ -
{{dmap_itemname}}
-
{{daap_songartist}}
-
- 0:00 - - -0:00 -
\ No newline at end of file +<% if (typeof dmap_itemnname !== "undefined") { %> +
{{dmap_itemname}}
+
{{daap_songartist}}
+
+ 0:00 + + -0:00 +
+<% } else { %> +

DAAPr3

+<% } %> \ No newline at end of file