From 13e18ba442a39d3840cdc8c9157d220b2f797112 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 17 Jun 2015 21:41:22 -0400 Subject: [PATCH] update bravia profiles --- dashboard-ui/channelitems.html | 4 +- dashboard-ui/channels.html | 4 +- dashboard-ui/channelslatest.html | 4 +- dashboard-ui/css/librarybrowser.css | 72 +++++++---- dashboard-ui/css/librarymenu.css | 15 +-- dashboard-ui/css/mediaplayer-video.css | 4 +- dashboard-ui/css/mediaplayer.css | 9 +- dashboard-ui/css/site.css | 9 +- dashboard-ui/favorites.html | 13 +- dashboard-ui/homelatest.html | 10 +- dashboard-ui/index.html | 10 +- dashboard-ui/itemdetails.html | 20 +-- dashboard-ui/livetvchannel.html | 12 +- dashboard-ui/livetvchannels.html | 12 +- dashboard-ui/livetvguide.html | 12 +- dashboard-ui/livetvitems.html | 12 +- dashboard-ui/livetvnewrecording.html | 12 +- dashboard-ui/livetvprogram.html | 12 +- dashboard-ui/livetvrecording.html | 12 +- dashboard-ui/livetvrecordinglist.html | 12 +- dashboard-ui/livetvrecordings.html | 12 +- dashboard-ui/livetvseriestimer.html | 12 +- dashboard-ui/livetvseriestimers.html | 12 +- dashboard-ui/livetvsuggested.html | 12 +- dashboard-ui/livetvtimer.html | 12 +- dashboard-ui/livetvtimers.html | 12 +- dashboard-ui/mysync.html | 2 +- dashboard-ui/mysyncjob.html | 2 +- dashboard-ui/photos.html | 6 +- dashboard-ui/playlistedit.html | 2 +- dashboard-ui/playlists.html | 2 +- dashboard-ui/scripts/extensions.js | 4 +- dashboard-ui/scripts/favorites.js | 20 +-- dashboard-ui/scripts/librarybrowser.js | 3 +- dashboard-ui/scripts/librarymenu.js | 81 +++++++++---- dashboard-ui/scripts/mediaplayer-video.js | 2 +- dashboard-ui/scripts/metadatasubtitles.js | 2 +- dashboard-ui/scripts/nowplayingbar.js | 8 +- dashboard-ui/scripts/search.js | 9 +- dashboard-ui/scripts/sections.js | 3 +- dashboard-ui/scripts/site.js | 24 +--- dashboard-ui/scripts/sync.js | 3 +- dashboard-ui/themes/ios.css | 41 ++++++- dashboard-ui/thirdparty/cordova/chromecast.js | 2 +- .../thirdparty/cordova/generaldevice.js | 114 ++++++++++++++---- .../paper-button/paper-button-style.css | 8 +- dashboard-ui/tvrecommended.html | 10 +- dashboard-ui/tvupcoming.html | 10 +- 48 files changed, 429 insertions(+), 271 deletions(-) diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index 3b3da2de50..d803c37847 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -7,8 +7,8 @@
diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index 767ee588df..c7e34a0515 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -7,8 +7,8 @@
diff --git a/dashboard-ui/channelslatest.html b/dashboard-ui/channelslatest.html index aa251dbaca..b17aadae73 100644 --- a/dashboard-ui/channelslatest.html +++ b/dashboard-ui/channelslatest.html @@ -9,8 +9,8 @@
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 20450e6e6c..67d0ab75a3 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -80,9 +80,9 @@ margin-top: 20px; } -.homePageSection + .homePageSection { - margin-top: 30px; -} + .homePageSection + .homePageSection { + margin-top: 30px; + } .sectionHeaderButton { vertical-align: middle; @@ -1150,16 +1150,20 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { line-height: 1; } - .alphabetPicker a { - display: block; - text-decoration: none; - padding: 1px 0; - font-weight: 500; - } +.bottomSecondaryNav .alphabetPicker{ + bottom: 55px; +} - .alphabetPicker a:not(.selectedCharacter) { - color: #bbb !important; - } +.alphabetPicker a { + display: block; + text-decoration: none; + padding: 1px 0; + font-weight: 500; +} + + .alphabetPicker a:not(.selectedCharacter) { + color: #bbb !important; + } .selectedCharacter { @@ -1199,7 +1203,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { margin-right: auto; } -@media all and (min-height: 500px) { +@media all and (min-height: 520px) { .alphabetPicker { display: block; @@ -1217,7 +1221,35 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -@media all and (min-height: 800px) { +@media all and (min-height: 600px) { + + .alphabetPicker a { + padding: 2px 0; + } +} + +@media all and (min-height: 650px) { + + .alphabetPicker a { + padding: 3px 0; + } +} + +@media all and (min-height: 700px) { + + .alphabetPicker a { + padding: 4px 0; + } +} + +@media all and (min-height: 750px) { + + .alphabetPicker a { + padding: 5px 0; + } +} + +@media all and (min-height: 750px) { .alphabetPicker a { padding: 5px 0; @@ -1546,10 +1578,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -.latestChannelItemsDisabled .latestChannelItemsTab { - display: none !important; -} - .studioTabDisabled .tvStudiosTab, .studioTabDisabled .movieStudiosTab { display: none !important; } @@ -1562,14 +1590,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { display: none !important; } -.musicSongsTabDisabled .musicSongsTab { - display: none !important; -} - -.musicArtistsTabDisabled .musicArtistsTab { - display: none !important; -} - .movieTrailersTabDisabled .movieTrailersTab { display: none !important; } diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index a41e0e5e30..b4b7757ad3 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -142,6 +142,10 @@ -webkit-overflow-scrolling: touch; } + .libraryViewNav .material-icons { + display: none; + } + .bottomSecondaryNav .libraryViewNav { top: initial; bottom: 0; @@ -231,7 +235,7 @@ .libraryViewNav a { display: inline-block; - padding: 12px 0 9px; + padding: 14px 13px 11px; color: rgba(255,255,255,.8) !important; text-decoration: none; margin: 0 0; @@ -240,19 +244,10 @@ border-bottom: 5px solid transparent; } -.bottomSecondaryNav .libraryViewNav a { - padding: 12px 0 12px; -} - .libraryViewNav a:not(.ui-btn-active):hover { color: #2ad !important; } -.libraryViewNavLinkContent { - display: inline-block; - padding: 2px 13px 2px 13px; -} - @media all and (max-width: 500px) { .libraryMenuButtonText { diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index bf80defe8f..d643225598 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -47,7 +47,7 @@ } .videoTopControls { - padding: 1em; + padding: 0 1em; background-color: rgba(0, 0, 0, .5); position: absolute; left: 0; @@ -157,6 +157,8 @@ .videoTopControlsLogo { float: left; + /* Matches .mediaButton */ + padding-top: 16px; } .videoTopControlsLogo img { diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index 274516d7da..7c8a347941 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -1,6 +1,6 @@ /* Now playing bar */ .nowPlayingBar { - padding: 16px 0 16px 0; + padding: 0; border-top: 1px solid #444; text-align: center; } @@ -13,7 +13,8 @@ vertical-align: middle; font-size: 30px; color: #e8e8e8; - margin: 0 10px; + margin: 0; + padding: 16px 12px; min-width: 30px; text-align: center; } @@ -22,6 +23,10 @@ font-size: 26px; } +.videoControls .mediaButton { + padding: 0 10px; +} + #mediaElement { display: inline-block; position: relative; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index d530821aa1..6c47a5ff20 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -467,7 +467,7 @@ h1 a:hover { transform: translateY(-100%); } -.libraryViewNav.headroom--unpinned { +.libraryViewNav.headroom--unpinned:not(.headroomDisabled) { -webkit-transform: translateY(-200%); transform: translateY(-200%); } @@ -501,6 +501,9 @@ h1 a:hover { } } +textarea { + width: 100%; +} pre, textarea.pre { display: block; @@ -534,6 +537,10 @@ pre, textarea.pre { display: none; } +.forceHide { + display: none !important; +} + /* Header */ diff --git a/dashboard-ui/favorites.html b/dashboard-ui/favorites.html index c8cc41a3b5..01139f7f60 100644 --- a/dashboard-ui/favorites.html +++ b/dashboard-ui/favorites.html @@ -4,14 +4,15 @@ Emby -
+
+
diff --git a/dashboard-ui/homelatest.html b/dashboard-ui/homelatest.html index 25c42066a5..e44debadc8 100644 --- a/dashboard-ui/homelatest.html +++ b/dashboard-ui/homelatest.html @@ -9,11 +9,11 @@
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index 252e793aa4..18c4bff31b 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -9,11 +9,11 @@
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 00b2baff9f..787f8e39ea 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -10,11 +10,11 @@ @@ -44,9 +44,9 @@
diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index 4ab92ff6a8..2f26c7b797 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html index d5cebeda22..ae5f5393a4 100644 --- a/dashboard-ui/livetvchannels.html +++ b/dashboard-ui/livetvchannels.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html index c6d4598c06..f748553a48 100644 --- a/dashboard-ui/livetvguide.html +++ b/dashboard-ui/livetvguide.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html index 46d499b131..485808fb16 100644 --- a/dashboard-ui/livetvitems.html +++ b/dashboard-ui/livetvitems.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index 7a38589dca..a347c2642c 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html index f491442e33..400da208bf 100644 --- a/dashboard-ui/livetvprogram.html +++ b/dashboard-ui/livetvprogram.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index efbceeeab2..dc7417d0ca 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html index 6c8a21854f..ecfe91553b 100644 --- a/dashboard-ui/livetvrecordinglist.html +++ b/dashboard-ui/livetvrecordinglist.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index 188931f026..706ce3847e 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -8,12 +8,12 @@
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index c5e78e4381..73988245ae 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html index e35202d249..832006e199 100644 --- a/dashboard-ui/livetvseriestimers.html +++ b/dashboard-ui/livetvseriestimers.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html index b363b776e2..35b90fb282 100644 --- a/dashboard-ui/livetvsuggested.html +++ b/dashboard-ui/livetvsuggested.html @@ -8,12 +8,12 @@
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index a195e1f9fc..35bbd6b6a3 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html index 3f56f8925a..3a757f6682 100644 --- a/dashboard-ui/livetvtimers.html +++ b/dashboard-ui/livetvtimers.html @@ -6,12 +6,12 @@
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html index 186879e688..6a39433cb7 100644 --- a/dashboard-ui/mysync.html +++ b/dashboard-ui/mysync.html @@ -7,7 +7,7 @@
diff --git a/dashboard-ui/mysyncjob.html b/dashboard-ui/mysyncjob.html index e29162a7c0..fc7bc780bb 100644 --- a/dashboard-ui/mysyncjob.html +++ b/dashboard-ui/mysyncjob.html @@ -7,7 +7,7 @@
diff --git a/dashboard-ui/photos.html b/dashboard-ui/photos.html index d6ef8e6acc..48d2432ea8 100644 --- a/dashboard-ui/photos.html +++ b/dashboard-ui/photos.html @@ -7,9 +7,9 @@
diff --git a/dashboard-ui/playlistedit.html b/dashboard-ui/playlistedit.html index 549467eeb0..dd8613f3b3 100644 --- a/dashboard-ui/playlistedit.html +++ b/dashboard-ui/playlistedit.html @@ -7,7 +7,7 @@
diff --git a/dashboard-ui/playlists.html b/dashboard-ui/playlists.html index 852465008c..b9e539863c 100644 --- a/dashboard-ui/playlists.html +++ b/dashboard-ui/playlists.html @@ -7,7 +7,7 @@
diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js index c042cc260f..61282c1fb2 100644 --- a/dashboard-ui/scripts/extensions.js +++ b/dashboard-ui/scripts/extensions.js @@ -596,7 +596,7 @@ function ticks_to_human(str) { $.fn.visible = function(visible) { if (visible) { - return this.removeClass('hide'); + return this.removeClass('forceHide'); } - return this.addClass('hide'); + return this.addClass('forceHide'); }; \ No newline at end of file diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index 4ed039799a..24f8dddc2b 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -9,7 +9,6 @@ { name: Globalize.translate('HeaderFavoriteGames'), types: "Game", id: "favoriteGames", shape: 'autohome', preferThumb: false, showTitle: true }, { name: Globalize.translate('HeaderFavoriteAlbums'), types: "MusicAlbum", id: "favoriteAlbums", shape: 'square', preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true } ]; - } function loadSection(elem, userId, section, isSingleSection) { @@ -33,7 +32,7 @@ options.Limit = null; } - ApiClient.getItems(userId, options).done(function (result) { + return ApiClient.getItems(userId, options).done(function (result) { var html = ''; @@ -53,23 +52,22 @@ }); if (result.TotalRecordCount > result.Items.length) { - html += '
'; - var href = "favorites.html?sectionid=" + section.id; - html += '' + Globalize.translate('ButtonMoreItems') + ''; - html += '
'; + html += '' + Globalize.translate('ButtonMoreItems') + ''; } html += '
'; } - elem = $(elem).html(html).trigger('create').lazyChildren(); + elem = $(elem).html(html).lazyChildren(); elem.createCardMenus(); }); } function loadSections(page, userId) { + Dashboard.showLoadingMsg(); + var sections = getSections(); var sectionid = getParameterByName('sectionid'); @@ -95,14 +93,20 @@ elem.html(html); } + var promises = []; + for (i = 0, length = sections.length; i < length; i++) { var section = sections[i]; elem = $('.section' + section.id, page); - loadSection(elem, userId, section, sections.length == 1); + promises.push(loadSection(elem, userId, section, sections.length == 1)); } + + $.when(promises).done(function () { + Dashboard.hideLoadingMsg(); + }); } $(document).on('pageshowready', "#favoritesPage", function () { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 9939e1c5a7..9044f2c7ca 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1494,7 +1494,8 @@ anchorCssClass += ' itemWithAction'; } - html += ''; + var transition = options.transition === false || !AppInfo.enableSectionTransitions ? '' : ' data-transition="slide"'; + html += ''; html += '
'; if (icon) { html += ''; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 7801e23a08..045f5b2a88 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,11 +1,14 @@ (function (window, document, $, devicePixelRatio) { + var backStack = []; + var addNextToBackStack = true; + function renderHeader() { var html = '
'; if (AppInfo.enableBackButton) { - html += ''; + html += ''; } html += '
'; - $('.downloadLanguages', page).html(html).trigger("create"); + $('.downloadLanguages', page).html(html).trigger('create'); var langs = config.DownloadLanguages || []; diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js index 35eb398916..9c68a1a504 100644 --- a/dashboard-ui/scripts/nowplayingbar.js +++ b/dashboard-ui/scripts/nowplayingbar.js @@ -22,13 +22,15 @@ var html = ''; - html += '