diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index d4d75eca65..adda4287b4 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "~1.0.4", + "_target": "1.0.x", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index d1982e29d1..79061c0e10 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -27,14 +27,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-behaviors", + "homepage": "https://github.com/PolymerElements/iron-behaviors", "_release": "1.0.10", "_resolution": { "type": "version", "tag": "v1.0.10", "commit": "da937a6c5841fc9dba57f3087083445c9ad709a8" }, - "_source": "git://github.com/polymerelements/iron-behaviors.git", + "_source": "git://github.com/PolymerElements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-behaviors" + "_originalSource": "PolymerElements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index e1304d174b..f4bfef4a7c 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index fc500c12fb..9a26a4dc8c 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -31,14 +31,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.4", "_resolution": { "type": "version", "tag": "v1.0.4", "commit": "5f5893ca7bd6a8413d2f777c092a1a179b6bd45e" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index fa58dc0abe..912de7705a 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -476,12 +476,13 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailImageContainer img { - max-width: 280px; - max-height: 300px; + width: 280px; + /* This is just to make sure it always takes up some space */ + min-height: 140px; } .portraitDetailImageContainer img { - max-width: 220px; + width: 220px; } .squareDetailImageContainer { @@ -547,11 +548,13 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailImageContainer img { - max-width: 240px; + width: 240px; + /* This is just to make sure it always takes up some space */ + min-height: 120px; } .portraitDetailImageContainer img { - max-width: 180px; + width: 180px; } } @@ -893,7 +896,9 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailImageContainer img { - max-width: 140px; + width: 140px; + /* This is just to make sure it always takes up some space */ + min-height: 140px; } .inlineItemName { @@ -909,7 +914,9 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .thumbDetailImageContainer img { - max-width: 180px; + width: 180px; + /* This is just to make sure it always takes up some space */ + min-height: 60px; } } @@ -923,11 +930,15 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { @media all and (max-width: 500px) { .detailImageContainer img { - max-width: 80px; + width: 80px; + /* This is just to make sure it always takes up some space */ + min-height: 60px; } .thumbDetailImageContainer img { - max-width: 180px; + width: 180px; + /* This is just to make sure it always takes up some space */ + min-height: 60px; } } diff --git a/dashboard-ui/scripts/externalplayer.js b/dashboard-ui/scripts/externalplayer.js index 96e6aa8872..29dd063532 100644 --- a/dashboard-ui/scripts/externalplayer.js +++ b/dashboard-ui/scripts/externalplayer.js @@ -93,12 +93,53 @@ { Condition: 'LessThanEqual', Property: 'VideoLevel', - Value: '41' + Value: '50' }] }); // Subtitle profiles profile.SubtitleProfiles = []; + profile.SubtitleProfiles.push({ + Format: 'srt', + Method: 'Embed' + }); + profile.SubtitleProfiles.push({ + Format: 'subrip', + 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' + }); + profile.ResponseProfiles = []; return profile; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 831a1757b6..84080061f7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1467,7 +1467,7 @@ supportsAddingToCollection: function (item) { - var invalidTypes = ['Person', 'Genre', 'MusicGenre', 'Studio', 'GameGenre', 'BoxSet', 'Playlist', 'UserView', 'CollectionFolder', 'Audio', 'Episode', 'TvChannel', 'Program']; + var invalidTypes = ['Person', 'Genre', 'MusicGenre', 'Studio', 'GameGenre', 'BoxSet', 'Playlist', 'UserView', 'CollectionFolder', 'Audio', 'Episode', 'TvChannel', 'Program', 'MusicAlbum']; return !item.CollectionType && invalidTypes.indexOf(item.Type) == -1 && item.MediaType != 'Photo'; },