diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 1f74bb03e1..589b709429 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -504,6 +504,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { max-height: 300px; } +.portraitDetailImageContainer img { + max-width: 220px; +} + .squareDetailImageContainer { margin-top: -150px; } diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index febd1b95a2..d4e2d70212 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -133,7 +133,7 @@ -
+
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html index 764d49e059..2615bc6f46 100644 --- a/dashboard-ui/livetvstatus.html +++ b/dashboard-ui/livetvstatus.html @@ -4,7 +4,7 @@ ${TitleLiveTV} -
+
@@ -19,37 +19,29 @@ -
+
@@ -248,7 +248,7 @@
-
+
@@ -290,7 +290,7 @@
-
+
diff --git a/dashboard-ui/music.html b/dashboard-ui/music.html index 50c228aaf2..dc6fc409ec 100644 --- a/dashboard-ui/music.html +++ b/dashboard-ui/music.html @@ -136,7 +136,7 @@
-
+
@@ -192,7 +192,7 @@
-
+
@@ -227,7 +227,7 @@
-
+
@@ -263,7 +263,7 @@
-
+
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index 75b013af00..9ec86f9db7 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -361,7 +361,7 @@ // on here $('.btnOrganize', page).taskButton({ mode: 'on', - progressElem: $('.organizeProgress', page), + progressElem: page.querySelector('.organizeProgress'), panel: $('.organizeTaskPanel', page), taskKey: 'AutoOrganize' }); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 10df909bb6..6bd8eabcda 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -2520,6 +2520,11 @@ }, + openViewPanel: function (btn, className) { + + $('.' + className, jQuery(btn).parents('.page')).removeClass('hide').panel('toggle'); + }, + getQueryPagingHtml: function (options) { var startIndex = options.startIndex; @@ -2583,7 +2588,7 @@ //html += ''; var viewPanelClass = options.viewPanelClass || 'viewPanel'; var title = options.viewIcon == 'filter-list' ? Globalize.translate('ButtonFilter') : Globalize.translate('ButtonMenu'); - html += ''; + html += ''; } html += '
'; diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index 1875989a5b..5a774ddac6 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -24,70 +24,64 @@ var html = ''; - for (var i = 0, length = tuners.length; i < length; i++) { + if (tuners.length) { + html += '
'; - var tuner = tuners[i]; + for (var i = 0, length = tuners.length; i < length; i++) { - html += ''; + var tuner = tuners[i]; + html += ''; - html += ''; - html += tuner.Name; - html += ''; + html += ''; - html += ''; - html += tuner.SourceType; - html += ''; + html += ''; - html += ''; + html += '
'; + html += tuner.Name; + html += '
'; - if (tuner.Status == 'RecordingTv') { - if (tuner.ChannelName) { + html += '
'; + html += tuner.SourceType; + html += '
'; - html += ''; - html += Globalize.translate('StatusRecordingProgram').replace('{0}', tuner.ChannelName); - html += ''; - } else { + html += '
'; + if (tuner.Status == 'RecordingTv') { + if (tuner.ChannelName) { - html += Globalize.translate('StatusRecording'); + html += ''; + html += Globalize.translate('StatusRecordingProgram').replace('{0}', tuner.ChannelName); + html += ''; + } else { + + html += Globalize.translate('StatusRecording'); + } } - } - else if (tuner.Status == 'LiveTv') { + else if (tuner.Status == 'LiveTv') { - if (tuner.ChannelName) { + if (tuner.ChannelName) { - html += ''; - html += Globalize.translate('StatusWatchingProgram').replace('{0}', tuner.ChannelName); - html += ''; - } else { + html += ''; + html += Globalize.translate('StatusWatchingProgram').replace('{0}', tuner.ChannelName); + html += ''; + } else { - html += Globalize.translate('StatusWatching'); + html += Globalize.translate('StatusWatching'); + } } - } - else { - html += tuner.Status; - } - html += ''; + else { + html += tuner.Status; + } + html += '
'; - html += ''; - - if (tuner.ProgramName) { - html += tuner.ProgramName; + html += ''; + html += ''; + html += ''; } - html += ''; - - html += ''; - html += tuner.Clients.join('
'); - html += ''; - - html += ''; - html += ''; - html += ''; - - html += ''; + html += '
'; } - var elem = $('.tunersResultBody', page).html(html).parents('.tblTuners').table("refresh").trigger('create'); + var elem = $('.tunerList', page).html(html); $('.btnResetTuner', elem).on('click', function () { @@ -498,6 +492,7 @@ var page = this; reload(page); + }); })(jQuery, document, window); diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 291ffcac75..623fc64f36 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -378,7 +378,7 @@ var WizardLibraryPage = { // on here $('.btnRefresh', page).taskButton({ mode: 'on', - progressElem: $('.refreshProgress', page), + progressElem: page.querySelector('.refreshProgress'), lastResultElem: $('.lastRefreshResult', page), taskKey: 'RefreshLibrary' }); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 23ff250e0d..b797d90b84 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -438,30 +438,38 @@ Format: 'srt', Method: 'Embed' }); - //profile.SubtitleProfiles.push({ - // Format: 'ass', - // Method: 'Embed' - //}); - //profile.SubtitleProfiles.push({ - // Format: 'ssa', - // Method: 'Embed' - //}); - //profile.SubtitleProfiles.push({ - // Format: 'pgs', - // Method: 'Embed' - //}); - //profile.SubtitleProfiles.push({ - // Format: 'pgssub', - // Method: 'Embed' - //}); - //profile.SubtitleProfiles.push({ - // Format: 'dvdsub', - // Method: 'Embed' - //}); + profile.SubtitleProfiles.push({ + Format: 'ass', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'ssa', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'pgs', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'pgssub', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'dvdsub', + Method: 'Embed' + }); profile.SubtitleProfiles.push({ Format: 'vtt', Method: 'Embed' }); + profile.SubtitleProfiles.push({ + Format: 'sub', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'idx', + Method: 'Embed' + }); } else { profile.SubtitleProfiles.push({ Format: 'vtt', @@ -733,7 +741,7 @@ if (positionSlider) { - positionSlider.disabled = !canClientSeek; + positionSlider.disabled = !((self.currentDurationTicks || 0) > 0 || canClientSeek); } if (currentTimeElement) { diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 0ffcc9c658..57bc63a310 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -317,7 +317,7 @@ // on here $('.btnSync', page).taskButton({ mode: 'on', - progressElem: $('.syncProgress', page), + progressElem: page.querySelector('.syncProgress'), taskKey: 'SyncPrepare' }); diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js index ae2e8335a2..2469a7f3d9 100644 --- a/dashboard-ui/scripts/taskbutton.js +++ b/dashboard-ui/scripts/taskbutton.js @@ -39,12 +39,12 @@ $.fn.taskButton = function (options) { var progress = (task.CurrentProgressPercentage || 0).toFixed(1); if (options.progressElem) { - var progressElem = options.progressElem.val(progress); + options.progressElem.value = progress; if (task.State == 'Running') { - progressElem.show(); + options.progressElem.classList.remove('hide'); } else { - progressElem.hide(); + options.progressElem.classList.add('hide'); } } diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 658d8430c2..8a5d67023a 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -278,6 +278,11 @@ paper-fab { height: 22px; } + paper-fab.mini iron-icon { + width: 22px; + height: 22px; + } + paper-fab.subdued { background: #404040; color: #fff;