diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 39ec4a6476..a34546ea47 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.58", - "_release": "1.4.58", + "version": "1.4.59", + "_release": "1.4.59", "_resolution": { "type": "version", - "tag": "1.4.58", - "commit": "2bbc190d69ad89110a7b83eec624fbd44df9b17c" + "tag": "1.4.59", + "commit": "7e348b4fcb9c8728789b0b54f465eaa4a32a5e69" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browser.js b/dashboard-ui/bower_components/emby-webcomponents/browser.js index 9369fab630..476da407a0 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browser.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browser.js @@ -91,6 +91,7 @@ if (userAgent.toLowerCase().indexOf("playstation 4") != -1) { browser.ps4 = true; + browser.tv = true; } if (isMobile.any) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index daaafc5e1c..4846ccc641 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -172,7 +172,6 @@ define(['browser'], function (browser) { if (browser.tizen) { - return 10000000; // 2015 models if (userAgent.indexOf('tizen 2.3') != -1) { return 20000000; diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css index 05f6974b60..e7fc7c5fdc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css +++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css @@ -14,7 +14,8 @@ button.listItem { display: flex; align-items: center; text-align: left; - padding: .25em 1.25em !important; + padding: 0 1em !important; + line-height: 170%; } .listItem.largeImage { @@ -27,15 +28,32 @@ button.listItem { .listItemBody { flex-grow: 1; - padding: .85em 1.25em; + padding: 0 1.15em; overflow: hidden; text-overflow: ellipsis; + display: flex; + flex-direction: column; + vertical-align: middle; + justify-content: center; + min-height: 48px; } + .listItemBody.two-line { + min-height: 72px; + padding-top: 0; + padding-bottom: 0; + } + + .listItemBody.three-line { + min-height: 88px; + padding-top: 0; + padding-bottom: 0; + } + .listItemBody h3 { margin: 0; font-weight: normal; - padding: .25em 0; + padding: 0; overflow: hidden; text-overflow: ellipsis; } @@ -44,6 +62,10 @@ button.listItem { padding: 0; } +.listItemBody > div:not(.secondary) { + font-size: 115%; +} + .listItemBodyText { overflow: hidden; text-overflow: ellipsis; @@ -55,6 +77,7 @@ button.listItem { background-repeat: no-repeat; background-size: contain; flex-shrink: 0; + margin-left: -.9em; } .listItemIcon { diff --git a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js index 6bffe17302..eca671e55c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js @@ -123,7 +123,7 @@ itemHtml += 'closed_caption'; - itemHtml += '
'; + itemHtml += '
'; itemHtml += '

'; itemHtml += s.DisplayTitle || ''; @@ -237,7 +237,7 @@ html += 'closed_caption'; - html += '
'; + html += '
'; //html += ''; diff --git a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json index cca11d8994..2e765b9324 100644 --- a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json @@ -28,14 +28,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/iron-resizable-behavior", + "homepage": "https://github.com/PolymerElements/iron-resizable-behavior", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "dda1df6aaf452aedf3e52ff0cf69e72439452216" }, - "_source": "git://github.com/polymerelements/iron-resizable-behavior.git", + "_source": "git://github.com/PolymerElements/iron-resizable-behavior.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-resizable-behavior" + "_originalSource": "PolymerElements/iron-resizable-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 01c5a1084b..955c9dc566 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.5.2", "commit": "18e8e12dcd9a4560de480562f65935feed334b86" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index e3120e6882..4782b3c50f 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -39,6 +39,6 @@ "commit": "ce5b9fb2d8aa03c698410e2e55cffcfa0b788a3a" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.1.0", + "_target": "^1.0.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/components/channelmapper/channelmapper.js b/dashboard-ui/components/channelmapper/channelmapper.js index 37c8fc1db5..9c7ae876d8 100644 --- a/dashboard-ui/components/channelmapper/channelmapper.js +++ b/dashboard-ui/components/channelmapper/channelmapper.js @@ -97,7 +97,7 @@ function (dialogHelper, loading, connectionManager, globalize, actionsheet) { html += ''; - html += '
'; + html += '
'; html += '

'; html += channel.Name; html += '

'; diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js index eac0c6948a..34bfb1de3c 100644 --- a/dashboard-ui/components/remotecontrol.js +++ b/dashboard-ui/components/remotecontrol.js @@ -435,7 +435,7 @@ var item = itemsContainer.querySelectorAll('.listItem')[index]; if (item) { - var img = item.querySelector('.listviewImage'); + var img = item.querySelector('.listItemImage'); img.classList.remove('lazy'); img.classList.add('playlistIndexIndicatorImage'); diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index c934c1bc1e..0c97cf0589 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1019,7 +1019,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .itemsContainer { margin: 0 auto; - line-height: 0; } .alphabetPicker { @@ -1174,21 +1173,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .itemsListview { margin: 0 auto !important; max-width: 1000px; -} - -.itemsListview { background-color: transparent !important; box-shadow: none !important; } .itemsListview .listItem { - border-bottom: 1px solid #303030; - padding-left: 0; - padding-right: 0; - } - - .itemsListview .listviewMenuButton { - margin-right: 0 !important; + border-bottom: 1px solid #2a2a2a; } .itemsListview .ui-li-count { @@ -1207,50 +1197,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { left: 55px; } - .itemsListview .content-icon { - width: auto !important; - padding-right: .7em; - } - - .itemsListview.paperList { - text-align: left; - } - - .itemsListview paper-item-body { - min-height: 0 !important; - } - - .itemsListview .mediaItem { - padding: 7px 0; - } - -.listviewImage { - width: 80px; - height: 80px; - background-repeat: no-repeat; - background-size: contain; - background-position: center center; -} - - .listviewImage.small { - width: 70px; - height: 70px; - background-repeat: no-repeat; - background-size: contain; - background-position: center center; - } - -.listViewUserDataButtons { - visibility: hidden; -} - -@media all and (min-width: 1200px) { - - .listItem:hover .listViewUserDataButtons { - visibility: visible !important; - } -} - @media all and (max-width: 1200px) { .listViewUserDataButtons { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 8d2c49760d..e7052af336 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -219,7 +219,7 @@ } .viewMenuBar, .libraryViewNav { - background-color: #2a2a2a; + background-color: #2b2b2b; color: #fff; } diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index c13caddd15..8e5ba136f3 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -59,7 +59,7 @@ /* Above everything, except for the video player and popup overlays */ z-index: 1097; color: #fff; - background-color: #2a2a2a; + background-color: #2b2b2b; text-align: center; display: flex; flex-direction: row; diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 6e57ca8a74..12afdf8197 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -131,7 +131,7 @@
-
+
TOMATOMETER®
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html index e786c686dd..e656bd9562 100644 --- a/dashboard-ui/mypreferencesmenu.html +++ b/dashboard-ui/mypreferencesmenu.html @@ -7,7 +7,7 @@
-
+
${ButtonDisplaySettings}
${ButtonDisplaySettingsHelp}
@@ -17,7 +17,7 @@
-
+
${ButtonHomeScreenSettings}
${ButtonHomeScreenSettingsHelp}
@@ -27,7 +27,7 @@
-
+
${ButtonPlaybackSettings}
${ButtonPlaybackSettingsHelp}
@@ -37,7 +37,7 @@
-
+
${ButtonProfile}
${ButtonProfileHelp}
@@ -47,7 +47,7 @@
-
+
${ButtonSyncSettings}
${ButtonSyncSettingsHelp}
@@ -61,14 +61,14 @@
-
+
${HeaderSelectServer}
-
+
${ButtonSignOut}
@@ -82,7 +82,7 @@
-
+
${ButtonServerDashboard}
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 38f458ccf4..b2c549cfcc 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -389,9 +389,9 @@ } if (!item.SpecialFeatureCount || item.SpecialFeatureCount == 0 || item.Type == "Series") { - page.querySelector('#scenesCollapsible').classList.add('hide'); + page.querySelector('#specialsCollapsible').classList.add('hide'); } else { - page.querySelector('#scenesCollapsible').classList.remove('hide'); + page.querySelector('#specialsCollapsible').classList.remove('hide'); renderSpecials(page, item, user, 6); } if (!item.People || !item.People.length) { @@ -1234,7 +1234,7 @@ } } - html += '
'; + html += '
'; html += '
' + review.Caption + '
'; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 1787e6d5f1..3ca483eca4 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1229,7 +1229,7 @@ getListViewHtml: function (options) { - require(['paper-icon-item', 'paper-item-body', 'material-icons']); + require(['listViewStyle', 'material-icons']); var outerHtml = ""; @@ -1276,7 +1276,7 @@ var cssClass = 'listItem'; var href = LibraryBrowser.getHref(item, options.context); - html += ''; + html += '
'; var imgUrl; @@ -1327,15 +1327,15 @@ if (imgUrl) { if (options.smallIcon) { - html += '
'; + html += '
'; } else { - html += '
'; + html += '
'; } } else { if (options.smallIcon) { - html += '
'; + html += '
'; } else { - html += '
'; + html += '
'; } } @@ -1383,19 +1383,20 @@ }) + '
'); } - if (textlines.length > 2) { - html += ''; - } else { - html += ''; - } - var defaultAction = options.defaultAction; if (defaultAction == 'play' || defaultAction == 'playallfromhere') { if (item.PlayAccess != 'Full') { defaultAction = null; } } - var defaultActionAttribute = defaultAction ? (' data-action="' + defaultAction + '" class="itemWithAction mediaItem clearLink"') : ' class="mediaItem clearLink"'; + + var bodyCssClass = 'mediaItem clearLink listItemBody'; + if (textlines.length > 2) { + bodyCssClass += ' three-line'; + } else { + bodyCssClass += ' two-line'; + } + var defaultActionAttribute = defaultAction ? (' data-action="' + defaultAction + '" class="itemWithAction ' + bodyCssClass + '"') : ' class="' + bodyCssClass + '"'; html += ''; for (var i = 0, textLinesLength = textlines.length; i < textLinesLength; i++) { @@ -1403,21 +1404,20 @@ if (i == 0) { html += '
'; } else { - html += '
'; + html += '
'; } html += textlines[i] || ' '; html += '
'; } html += ''; - html += ''; html += ''; html += ''; html += LibraryBrowser.getUserDataIconsHtml(item); html += ''; - html += ''; + html += '
'; index++; return html; diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index f761970926..1567d5f4c6 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -8,7 +8,7 @@ html += ''; - html += '
'; + html += '
'; html += ''; html += '
'; diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index 4b2572ebca..31096fc815 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -42,7 +42,7 @@ html += ''; - html += '
'; + html += '
'; html += ''; html += '

'; html += timer.Name; diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js index d2a2b61983..56b0bf7b0b 100644 --- a/dashboard-ui/scripts/playlistedit.js +++ b/dashboard-ui/scripts/playlistedit.js @@ -76,7 +76,7 @@ elem.innerHTML = html; var listItems = []; - var elems = elem.querySelectorAll('PAPER-ICON-ITEM'); + var elems = elem.querySelectorAll('.listItem'); for (var i = 0, length = elems.length; i < length; i++) { listItems.push(elems[i]); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b368936285..aa97c715f3 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -319,14 +319,16 @@ var Dashboard = { var parentElem = footer.querySelector('#footerNotifications'); - var elem = parentElem.querySelector('#' + options.id); + var notificationElementId = 'notification' + options.id; - if (!elem.length) { - parentElem.insertAdjacentHTML('beforeend', '

'); - elem = parentElem.querySelector('#' + options.id); + var elem = parentElem.querySelector('#' + notificationElementId); + + if (!elem) { + parentElem.insertAdjacentHTML('beforeend', '

'); + elem = parentElem.querySelector('#' + notificationElementId); } - var onclick = removeOnHide ? "jQuery(\"#" + options.id + "\").trigger(\"notification.remove\").remove();" : "jQuery(\"#" + options.id + "\").trigger(\"notification.hide\").hide();"; + var onclick = removeOnHide ? "jQuery('#" + notificationElementId + "').trigger('notification.remove').remove();" : "jQuery('#" + notificationElementId + "').trigger('notification.hide').hide();"; if (options.allowHide !== false) { options.html += '";