diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 644e82a9c6..f603b757ed 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -87,7 +87,7 @@ } .selectedViewLink { - color: #fff; + color: #fff!important; } .selectedViewIndicator { @@ -675,7 +675,7 @@ a.itemTag:hover { display: none; } - .desktopViewMenuLink { + .desktopViewMenuLink:not(.selectedViewLink) { display: none; } diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index f3348f0371..24cef9ef6d 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -90,7 +90,6 @@ .itemVideo { z-index: 99998; background: #000; - border: 1px solid #444; width: 320px; margin: 20px; position: fixed; @@ -128,7 +127,7 @@ z-index: 99997; background: #1d1d1d; position: fixed; - border: 1px solid green; + border: 1px solid #333; top: 50%; left: 50%; margin-left: -170px; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 94df6fd646..471f9900bf 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -461,13 +461,6 @@ } } - var enableRibbons = false; - var user = Dashboard.getCurrentUser().done(function (data) { - if (data.Configuration) { - enableRibbons = data.Configuration.DisplayMovieFormatRibbons; - } - }); - for (var i = 0, length = items.length; i < length; i++) { var item = items[i]; @@ -672,7 +665,7 @@ html += ''; // Ribbon - if (item.MediaType == "Video" && enableRibbons) { + if (item.MediaType == "Video" && item.Video3DFormat) { // This would be much better if specified in the json payload // Another nice thing to have in the payload would be 720 vs 1080 // Then, rather than "HD" it could display the specific HD format diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 9834b8ed8d..a640682a1b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -92,9 +92,9 @@ html += '' + (view == 'games' ? selectedHtml : '') + 'Games'; } - if (counts.BoxSetCount) { + //if (counts.BoxSetCount) { html += '' + (view == 'boxsets' ? selectedHtml : '') + 'Collections'; - } + //} $('.viewMenuRemoteControlButton', page).before(html); } @@ -148,9 +148,9 @@ html += '
  • Games
  • '; } - if (counts.BoxSetCount) { + //if (counts.BoxSetCount) { html += '
  • Collections
  • '; - } + //} html += ''; html += ''; diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 91b7922d19..3bc3686722 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -27,8 +27,6 @@ $('#chkManageLiveTv', page).checked(user.Configuration.EnableLiveTvManagement || false).checkboxradio("refresh"); $('#chkEnableLiveTvAccess', page).checked(user.Configuration.EnableLiveTvAccess || false).checkboxradio("refresh"); - $('#chkDisplayMovieFormatRibbons', page).checked(user.Configuration.DisplayMovieFormatRibbons || false).checkboxradio("refresh"); - Dashboard.hideLoadingMsg(); } @@ -61,7 +59,6 @@ user.Configuration.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked(); user.Configuration.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked(); user.Configuration.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked(); - user.Configuration.DisplayMovieFormatRibbons = $('#chkDisplayMovieFormatRibbons', page).checked(); var userId = getParameterByName("userId"); diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index a6fad858bd..098bb68295 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -44,10 +44,6 @@ -
    - - -