diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index fc55bc292a..b99435bb92 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabCollections} @@ -22,14 +22,14 @@
 
- +
-
+

${HeaderNewCollection}

@@ -48,7 +48,7 @@

- +

@@ -118,7 +118,7 @@
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 871db6b49c..d6150ffa2b 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -63,9 +63,15 @@ } .libraryMenuButton { + /*padding-left: 10px; + opacity: .85;*/ } - .libraryMenuButton img { +.headerHomeButton { + padding-right: 0!important; +} + + .libraryMenuButton img, .headerHomeButton img { border: 1px solid #444 !important; padding: .5em; background-color: #181818; @@ -77,7 +83,7 @@ opacity: 1!important; } - .libraryMenuButton img:hover { + .libraryMenuButton img:hover, .headerHomeButton img:hover { background-color: #38c; } @@ -92,7 +98,7 @@ padding-left: 0 !important; position: relative; top: 2px; - margin-left: -5px; + margin-left: -8px; cursor: default; } @@ -214,7 +220,7 @@ background-position: 16px center; } -.moviesViewMenu { +.moviesViewMenu, .trailersViewMenu { background-image: url(images/items/folders/movies.png); } @@ -263,6 +269,10 @@ background-image: url(images/items/folders/report.png); } +.homevideosViewMenu, .adultvideosViewMenu { + background-image: url(images/items/folders/homevideos.png); +} + .viewMenuSecondary { position: absolute; top: 0; diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 0baca9c6ef..6dcbb5f47b 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -148,7 +148,7 @@ padding: 0 0 0 43px; } -.moviesPosterItem .posterItemImage { +.moviesPosterItem .posterItemImage, .trailersPosterItem .posterItemImage { background-color: rgba(176, 94, 81, 0.7); } @@ -172,6 +172,22 @@ background-color: rgba(255, 233, 127, 0.7); } +.homevideosPosterItem .posterItemImage { + background-color: rgba(110, 52, 32, 0.7); +} + +.adultvideosPosterItem .posterItemImage { + background-color: rgba(184, 83, 116, 0.7); +} + +.photosPosterItem .posterItemImage { + background-color: rgba(127, 0, 0, 0.7); +} + +.musicvideosPosterItem .posterItemImage { + background-color: rgba(143, 54, 168, 0.7); +} + .backdropPosterItem { width: 128px; } diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index f06468ea8d..7321b13aa2 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -13,9 +13,7 @@ DashboardPage.startInterval(); $(ApiClient).on("websocketmessage", DashboardPage.onWebSocketMessage) - .on("websocketopen", DashboardPage.onWebSocketConnectionChange) - .on("websocketerror", DashboardPage.onWebSocketConnectionChange) - .on("websocketclose", DashboardPage.onWebSocketConnectionChange); + .on("websocketopen", DashboardPage.onWebSocketOpen); DashboardPage.lastAppUpdateCheck = null; DashboardPage.lastPluginUpdateCheck = null; @@ -180,9 +178,8 @@ } }, - onWebSocketConnectionChange: function () { + onWebSocketOpen: function () { - DashboardPage.stopInterval(); DashboardPage.startInterval(); }, @@ -192,6 +189,10 @@ DashboardPage.renderInfo(page, sessions); }); + ApiClient.getScheduledTasks().done(function (tasks) { + + DashboardPage.renderRunningTasks(page, tasks); + }); }, renderInfo: function (page, sessions) { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index e6af810322..ffe4d1a44b 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -31,14 +31,18 @@ imgUrl = "css/images/items/folders/games.png"; break; case "trailers": - imgUrl = "css/images/items/folders/games.png"; + imgUrl = "css/images/items/folders/movies.png"; break; + case "adultvideos": case "homevideos": imgUrl = "css/images/items/folders/homevideos.png"; break; case "musicvideos": imgUrl = "css/images/items/folders/musicvideos.png"; break; + case "books": + imgUrl = "css/images/items/folders/books.png"; + break; case "channels": imgUrl = "css/images/items/folders/channels.png"; break; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 922b6ec913..f9ca6e0ac3 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -4,6 +4,9 @@ var html = '
'; + //html += ''; + //html += ''; + //html += ''; html += ''; diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 36ffd8dc28..c438ef2d06 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -32,7 +32,7 @@ updateFilterControls(page); if (result.TotalRecordCount) { - + html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "portrait", @@ -41,11 +41,11 @@ centerText: true, lazy: true }); - + html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); $('.noItemsMessage', page).hide(); } else { - + $('.noItemsMessage', page).show(); } @@ -69,16 +69,6 @@ LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); - Dashboard.getCurrentUser().done(function(user) { - - if (user.Configuration.IsAdministrator) { - $('#btnNewCollection', page).removeClass('hide'); - } else { - $('#btnNewCollection', page).addClass('hide'); - } - - }); - Dashboard.hideLoadingMsg(); }); } @@ -116,7 +106,7 @@ function showNewCollectionPanel(page) { - $('#newCollectionPanel', page).panel('toggle'); + $('.newCollectionPanel', page).panel('toggle'); $('#txtNewCollectionName', page).val('').focus(); } @@ -190,11 +180,6 @@ reloadItems(page); }); - $('#btnNewCollection', page).on('click', function () { - - showNewCollectionPanel(page); - }); - }).on('pagebeforeshow', "#boxsetsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); @@ -214,9 +199,48 @@ }).on('pageshow', "#boxsetsPage", function () { updateFilterControls(this); + + }).on('collectionedit', "#boxsetsPage", function () { + + reloadItems(this); }); - window.BoxSetsPage = { +})(jQuery, document); + +(function ($, document) { + + function showNewCollectionPanel(page) { + + $('.newCollectionPanel', page).panel('toggle'); + + $('#txtNewCollectionName', page).val('').focus(); + } + + $(document).on('pageinit', ".collectionEditorPage", function () { + + var page = this; + + $('.btnNewCollection', page).on('click', function () { + + showNewCollectionPanel(page); + }); + + }).on('pagebeforeshow', ".collectionEditorPage", function () { + + var page = this; + + Dashboard.getCurrentUser().done(function (user) { + + if (user.Configuration.IsAdministrator) { + $('.btnNewCollection', page).removeClass('hide'); + } else { + $('.btnNewCollection', page).addClass('hide'); + } + + }); + }); + + window.BoxSetEditor = { onNewCollectionSubmit: function () { @@ -225,11 +249,11 @@ var page = $(this).parents('.page'); var url = ApiClient.getUrl("Collections", { - + Name: $('#txtNewCollectionName', page).val(), IsLocked: !$('#chkEnableInternetMetadata', page).checked(), - - ParentId: getParameterByName('parentId') || getParameterByName('topParentId') + + ParentId: getParameterByName('parentId') || LibraryMenu.getTopParentId() }); @@ -241,9 +265,9 @@ Dashboard.hideLoadingMsg(); - $('#newCollectionPanel', page).panel('toggle'); + $('.newCollectionPanel', page).panel('toggle'); - reloadItems(page); + $(page).trigger('collectionedit'); }); diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index c120c9d651..20ab69852b 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -319,10 +319,20 @@ } } else if (msg.MessageType === "PlaybackStart") { - firePlaybackEvent('playbackstart', msg.Data); + + if (msg.Data.DeviceId != ApiClient.deviceId()) { + if (MediaController.getPlayerInfo().id == msg.Data.Id) { + firePlaybackEvent('playbackstart', msg.Data); + } + } } else if (msg.MessageType === "PlaybackStopped") { - firePlaybackEvent('playbackstop', msg.Data); + + if (msg.Data.DeviceId != ApiClient.deviceId()) { + if (MediaController.getPlayerInfo().id == msg.Data.Id) { + firePlaybackEvent('playbackstop', msg.Data); + } + } } }