fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-22 09:38:18 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Various fixer uppers

Browse Source
This commit is contained in:
Fergal Moran
2014-08-17 23:42:50 +01:00
parent 1213885c1c
commit 1bcea9a6a7
4 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/css/dss.main.css
View File

@@ -782,3 +782,10 @@ img.mix-listing-image {
.btn-group a {
cursor: pointer;
}
.truncate {
width: 250px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

14
static/js/dss/apps/sidebar/views/sidebarLeftNav.coffee
View File

@@ -2,6 +2,9 @@
class Views.SidebarLeftNav extends Marionette.LayoutView
template: "sidebarleftnav"
regions:
nowPlayingRegion: '#sidebar-shortcuts-now-playing'
events:
"click #button-mute": "muteAudio"
"click #header-random-button": "showRandom"
@@ -14,6 +17,10 @@
initialize: ->
@listenTo App.vent, "mix:play", @trackPlaying
@listenTo App.vent, "mix:pause", @trackPaused
@listenTo App.vent, 'mix:init', @mixInit
onRender: ->
$('#sidebar-shortcuts-now-playing', @el).hide()
muteAudio: ->
if App.audioController.audioState is 0
@@ -36,5 +43,12 @@
donate: ->
App.vent.trigger('app:donate')
mixInit: (model) ->
$(@nowPlayingRegion.el).show()
@nowPlayingRegion.show(new App.NowPlayingApp.Views.NowPlayingView({
source: 'mix',
model: model
}))
Views.SidebarView

41
static/js/dss/templates/nowplaying.jst
View File

@@ -1,30 +1,19 @@
<div class="widget-header header-color-pink">
<h5>
<i class="fa fa-music"></i>
Now Playing
</h5>
</div>
<div class="profile-activity clearfix">
<div>
<img class="pull-left" alt="Alex Doe's avatar" src="<%= mix_image %>">
<a class="user" href="#"><%= user_name %></a>
<div class="widget-body">
<div class="profile-activity clearfix">
<div>
<img class="pull-left" alt="mix-image" src="<%= mix_image %>">
<a class="user" href="<%= item_url %>" title="<%= title %>"><%= title %></a>
<div class="time">
<i class="fa fa-user bigger-110"></i>
<a href="/<%= user_profile_url %>">
<%= user_name %>
</a>
</div>
</div>
<div class="now-playing-tools action-buttons">
<a id="now-playing-play" class="blue" data-bypass="true">
<i class="fa fa-play bigger-125"></i>
</a>
<a id="now-playing-pause" class="red" data-bypass="true">
<i class="fa fa-pause bigger-125"></i>
</a>
<div class="truncate pull-left white">
<%= title %>
</div>
</div>
<div class="tools action-buttons">
<a id="now-playing-play" class="blue" data-bypass="true">
<i class="fa fa-play bigger-125"></i>
</a>
<a id="now-playing-pause" class="red" data-bypass="true">
<i class="fa fa-pause bigger-125"></i>
</a>
</div>
</div>

2
static/js/dss/templates/sidebarleftnav.jst
View File

@@ -30,6 +30,8 @@
</div>
</div><!-- /.sidebar-shortcuts -->
<% } %>
<div class="sidebar-shortcuts" id="sidebar-shortcuts-now-playing">
</div>
<ul class="nav nav-list">