1
0
Fork 0

Player selector and template cleanup

master
Matthieu Lalonde 12 years ago
parent 8fbc98e84e
commit 84c0cdd2a5

@ -1,5 +1,5 @@
body > div.ui-layout-north #daaprPlayerViewport { body > div.ui-layout-north > div:last-child {
margin: 6px auto 0 auto; margin: 6px auto 0 auto;
background: transparent url('../img/player_background.png') repeat-x; background: transparent url('../img/player_background.png') repeat-x;
height: 40px; height: 40px;
@ -13,7 +13,7 @@ body > div.ui-layout-north #daaprPlayerViewport {
z-index: 10; z-index: 10;
} }
body > div.ui-layout-north #daaprPlayerViewport h1 { body > div.ui-layout-north > div:last-child > h1 {
color: #5F5F5F; color: #5F5F5F;
font-size: 2em; font-size: 2em;
font-style: oblique; font-style: oblique;

@ -10,6 +10,7 @@ define([
, "backbone" , "backbone"
, "text!../../templates/player/layout.html" , "text!../../templates/player/layout.html"
, "text!../../templates/player/player-status.html"
] ]
, function ( , function (
_ _
@ -17,6 +18,7 @@ _
, Backbone , Backbone
, tmplPlayerLayout , tmplPlayerLayout
, tmplPlayerStatus
) { ) {
"use strict"; "use strict";
@ -35,6 +37,8 @@ _
that.$el.html(tmplPlayerLayout); that.$el.html(tmplPlayerLayout);
that.$el.find("div:last").html(_.template(tmplPlayerStatus)({}));
return that; 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 () { , _createWebAudio: function () {
var that = this var that = this
; ;

@ -15,6 +15,4 @@
<input type="text" tabindex="1" class="span3 search-query"> <input type="text" tabindex="1" class="span3 search-query">
</div> </div>
</form> </form>
<div id="daaprPlayerViewport"> <div></div>
<h1>DAAPr<sup>3</sup></h1>
</div>

@ -1,7 +1,11 @@
<div class="daaprPlayerTitleIndicator">{{dmap_itemname}}</div> <% if (typeof dmap_itemnname !== "undefined") { %>
<div class="daaprPlayerInfoIndicator">{{daap_songartist}}</div> <div class="daaprPlayerTitleIndicator">{{dmap_itemname}}</div>
<div class="daaprProgressWrap"> <div class="daaprPlayerInfoIndicator">{{daap_songartist}}</div>
<span id="daaprProgressTimeElapsed">0:00</span> <div class="daaprProgressWrap">
<progress min="0" max="1" value="0" id="daaprPlayerProgress"></progress> <span id="daaprProgressTimeElapsed">0:00</span>
<span id="daaprProgressTimeRemain">-0:00</span> <progress min="0" max="1" value="0" id="daaprPlayerProgress"></progress>
</div> <span id="daaprProgressTimeRemain">-0:00</span>
</div>
<% } else { %>
<h1>DAAPr<sup>3</sup></h1>
<% } %>
Loading…
Cancel
Save