diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b7a8ec91c3..98b55edb8b 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -379,7 +379,7 @@ a.itemTag:hover { .itemBackdrop { background-size: cover; - background-position: center 13%; + background-position: center 15%; background-repeat: no-repeat; height: 600px; position: relative; @@ -664,13 +664,6 @@ a.itemTag:hover { } } -@media all and (min-width: 1000px) { - - .itemBackdrop { - background-size: 100% auto; - } -} - @media all and (min-width: 750px) { .detailPageContent { max-width: 900px; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 456c850762..022e4a3bbb 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -432,7 +432,7 @@ h1 .imageLink { } .content-primary { - padding: 80px 0 3em 0; + padding: 80px 15px 3em 0; margin: 0 0 0 260px; } diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 21b9226df5..5c6e930f06 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -13,7 +13,7 @@ ${TabDashboard} ${TabSettings} ${TabSecurity} - ${TabSync} +
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index db48db431d..d8762ddc42 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -13,7 +13,7 @@ ${TabDashboard} ${TabSettings} ${TabSecurity} - ${TabSync} +
diff --git a/dashboard-ui/notificationlist.html b/dashboard-ui/notificationlist.html index ab64dfaa93..1bb7722db3 100644 --- a/dashboard-ui/notificationlist.html +++ b/dashboard-ui/notificationlist.html @@ -12,14 +12,15 @@
- +
- +
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 9018b59372..eddd493a4b 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -63,12 +63,7 @@ var port = systemInfo.HttpServerPortNumber; - if (port == systemInfo.WebSocketPortNumber) { - - $('#ports', page).html(Globalize.translate('LabelRunningOnPort').replace('{0}', '' + port + '')); - } else { - $('#ports', page).html(Globalize.translate('LabelRunningOnPorts').replace('{0}', '' + port + '').replace('{1}', '' + systemInfo.WebSocketPortNumber + '')); - } + $('#ports', page).html(Globalize.translate('LabelRunningOnPort').replace('{0}', '' + port + '')); if (systemInfo.CanSelfRestart) { $('.btnRestartContainer', page).removeClass('hide'); diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 20b656034c..200a9ed8f4 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -90,7 +90,10 @@ Dashboard.getCurrentUser().done(function (user) { - if (user.Configuration.EnableContentDeletion && + if (item.Type == 'BoxSet') { + $('#fldDelete', page).show(); + } + else if (user.Configuration.EnableContentDeletion && item.Type != "TvChannel" && item.Type != "Genre" && item.Type != "Studio" && diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js index 4df2b61ef1..85a40791c0 100644 --- a/dashboard-ui/scripts/loginpage.js +++ b/dashboard-ui/scripts/loginpage.js @@ -133,9 +133,11 @@ html += '
'; html += ''; + var imgUrl; + if (user.PrimaryImageTag) { - var imgUrl = ApiClient.getUserImageUrl(user.Id, { + imgUrl = ApiClient.getUserImageUrl(user.Id, { width: 300, tag: user.PrimaryImageTag, type: "Primary" @@ -147,7 +149,9 @@ var background = LibraryBrowser.getMetroColor(user.Id); - html += '
'; + imgUrl = 'css/images/logindefault.png'; + + html += '
'; } html += '
'; diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 51f00bd1e5..347b1408e8 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -222,12 +222,10 @@ { name: "Music", value: "music" }, { name: "TV shows", value: "tvshows" }, { name: "Books*", value: "books" }, - { name: "Collections", value: "boxsets" }, { name: "Games*", value: "games" }, { name: "Home videos", value: "homevideos" }, { name: "Music videos", value: "musicvideos" }, { name: "Photos", value: "photos" }, - //{ name: "Trailers", value: "trailers" }, { name: "Adult videos", value: "adultvideos" }, { name: "Mixed movies & tv", value: "mixed" } ]; diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 071f286c82..9ee5d3599a 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -110,6 +110,7 @@ function isAvailable(item, user) { + return false; return item.SupportsSync; } diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 2e19de5aeb..5bf8147e34 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -124,10 +124,8 @@ if (userId) { $('#userProfileNavigation', page).show(); - $('.serverNavigation', page).hide(); } else { $('#userProfileNavigation', page).hide(); - $('.serverNavigation', page).show(); } Dashboard.getCurrentUser().done(function (loggedInUser) { diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html index 0607e2ff09..935212024d 100644 --- a/dashboard-ui/serversecurity.html +++ b/dashboard-ui/serversecurity.html @@ -13,7 +13,7 @@ ${TabDashboard} ${TabSettings} ${TabSecurity} - ${TabSync} +

diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index 876d0bd9a8..89f10f9c34 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -9,13 +9,6 @@