From 1c3cfad23ffc5d6059720bb2e0b2065627f54443 Mon Sep 17 00:00:00 2001 From: Qstick Date: Thu, 24 Aug 2017 22:51:36 -0400 Subject: [PATCH] Fix Misc UI issues (#62) --- src/UI/Activity/History/HistoryCollection.js | 3 ++- src/UI/Activity/History/HistoryLayout.js | 3 +-- src/UI/AlbumStudio/AlbumStudioLayout.js | 1 - src/UI/AlbumStudio/AlbumsCell.js | 1 + src/UI/AlbumStudio/SingleAlbumCellTemplate.hbs | 6 +++--- src/UI/AlbumStudio/albumstudio.less | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/UI/Activity/History/HistoryCollection.js b/src/UI/Activity/History/HistoryCollection.js index 1db28c7e4..93ae84ea4 100644 --- a/src/UI/Activity/History/HistoryCollection.js +++ b/src/UI/Activity/History/HistoryCollection.js @@ -50,7 +50,8 @@ var Collection = PageableCollection.extend({ }, sortMappings : { - 'artist' : { sortKey : 'artist.sortName' } + 'artist' : { sortKey : 'artist.sortName' }, + 'album' : { sortKey : 'album.title' } }, initialize : function(options) { diff --git a/src/UI/Activity/History/HistoryLayout.js b/src/UI/Activity/History/HistoryLayout.js index ec7f83c33..3223885f7 100644 --- a/src/UI/Activity/History/HistoryLayout.js +++ b/src/UI/Activity/History/HistoryLayout.js @@ -35,8 +35,7 @@ module.exports = Marionette.Layout.extend({ { name : 'album', label : 'Album Title', - cell : AlbumTitleCell, - sortable : false + cell : AlbumTitleCell }, { name : 'this', diff --git a/src/UI/AlbumStudio/AlbumStudioLayout.js b/src/UI/AlbumStudio/AlbumStudioLayout.js index 4a5d0ef4c..aba4256c2 100644 --- a/src/UI/AlbumStudio/AlbumStudioLayout.js +++ b/src/UI/AlbumStudio/AlbumStudioLayout.js @@ -42,7 +42,6 @@ module.exports = Marionette.Layout.extend({ tooltip : 'Toggle artist monitored status', sortable : false }, - { name : 'albums', label : 'Albums', diff --git a/src/UI/AlbumStudio/AlbumsCell.js b/src/UI/AlbumStudio/AlbumsCell.js index f35d71d9e..0c7d7efc0 100644 --- a/src/UI/AlbumStudio/AlbumsCell.js +++ b/src/UI/AlbumStudio/AlbumsCell.js @@ -11,6 +11,7 @@ var AlbumCollectionView = require('./AlbumStudioCollectionView'); module.exports = Marionette.Layout.extend({ template : 'AlbumStudio/AlbumsCellTemplate', + tagName : 'td', regions : { albums : '#albums' diff --git a/src/UI/AlbumStudio/SingleAlbumCellTemplate.hbs b/src/UI/AlbumStudio/SingleAlbumCellTemplate.hbs index 925a36573..5296d3b86 100644 --- a/src/UI/AlbumStudio/SingleAlbumCellTemplate.hbs +++ b/src/UI/AlbumStudio/SingleAlbumCellTemplate.hbs @@ -1,10 +1,10 @@ {{#if_eq statistics.totalTrackCount compare=0}} - + {{else}} {{#if_eq statistics.percentOfTracks compare=100}} - + {{else}} - + {{/if_eq}} {{/if_eq}} diff --git a/src/UI/AlbumStudio/albumstudio.less b/src/UI/AlbumStudio/albumstudio.less index 97d5b36cb..efa157d55 100644 --- a/src/UI/AlbumStudio/albumstudio.less +++ b/src/UI/AlbumStudio/albumstudio.less @@ -8,7 +8,7 @@ } } -.album { +.single-album { display : inline-block; margin-bottom : 4px;