diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 360a6ed04..20450e6e6 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -77,11 +77,11 @@ } .homePageSection { - margin-top: 1em; + margin-top: 20px; } .homePageSection + .homePageSection { - margin-top: 1.75em; + margin-top: 30px; } .sectionHeaderButton { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 4357911fe..d530821aa 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -448,10 +448,6 @@ h1 a:hover { display: none; } -body:not(.enableBackButton) .headerBackButton { - display: none; -} - /** * Note: I have omitted any vendor-prefixes for clarity. * Adding them is left as an exercise for the reader. diff --git a/dashboard-ui/editcollectionitems.html b/dashboard-ui/editcollectionitems.html index 357bbf93b..cb30dde3d 100644 --- a/dashboard-ui/editcollectionitems.html +++ b/dashboard-ui/editcollectionitems.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index 0b79066bf..517291c30 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 99b8a1827..4a90fbe13 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/edititemsubtitles.html b/dashboard-ui/edititemsubtitles.html index ed3e3e825..445a4a8a3 100644 --- a/dashboard-ui/edititemsubtitles.html +++ b/dashboard-ui/edititemsubtitles.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html index 06f6fae28..b363b776e 100644 --- a/dashboard-ui/livetvsuggested.html +++ b/dashboard-ui/livetvsuggested.html @@ -17,17 +17,17 @@
-
+

${HeaderWhatsOnTV}


-
+

${HeaderUpcomingPrograms}


-
+

${HeaderUpcomingMovies}

${ButtonMoreItems} @@ -35,7 +35,7 @@

-
+

${HeaderUpcomingSports}

${ButtonMoreItems} diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html index 1a1802bf1..26dda998a 100644 --- a/dashboard-ui/login.html +++ b/dashboard-ui/login.html @@ -45,14 +45,14 @@
${ButtonForgotPassword} -

- + +

diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 0d2981c03..668333304 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -193,7 +193,6 @@ } function supportInAppSignup() { - return false; return AppInfo.isNativeApp; return AppInfo.isNativeApp || getWindowUrl().toLowerCase().indexOf('https') == 0; } diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 170152d17..b0bdde468 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1090,7 +1090,7 @@ } if (limit && result.TotalRecordCount > limit) { - html += '

' + Globalize.translate('ButtonMoreItems') + '

'; + html += '

' + Globalize.translate('ButtonMoreItems') + '

'; } $('#criticReviewsContent', page).html(html).trigger('create'); @@ -1248,7 +1248,7 @@ } if (limit && chapters.length > limit) { - html += '

' + Globalize.translate('ButtonMoreItems') + '

'; + html += '

' + Globalize.translate('ButtonMoreItems') + '

'; } $('#scenesContent', page).html(html).trigger('create').lazyChildren(); @@ -1480,7 +1480,7 @@ } if (limit && items.length > limit) { - html += '

' + Globalize.translate('ButtonMoreItems') + '

'; + html += '

' + Globalize.translate('ButtonMoreItems') + '

'; } return html; @@ -1557,7 +1557,7 @@ } if (limit && casts.length > limit) { - html += '

' + Globalize.translate('ButtonMoreItems') + '

'; + html += '

' + Globalize.translate('ButtonMoreItems') + '

'; } $('#castContent', page).html(html).lazyChildren().trigger('create'); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 8e3bc0f99..7801e23a0 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -4,7 +4,9 @@ var html = '
'; - html += ''; + if (AppInfo.enableBackButton) { + html += ''; + } html += ''; - html += '
EMBY
'; + html += '
' + Globalize.translate('ButtonHome') + '
'; html += '
'; @@ -584,7 +586,7 @@ } else if (jPage.hasClass('allLibraryPage') || jPage.hasClass('type-interior')) { - $('.libraryMenuButtonText').html('EMBY'); + $('.libraryMenuButtonText').html(Globalize.translate('ButtonHome')); } } diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js index 0b8cee917..99b9de4f6 100644 --- a/dashboard-ui/scripts/loginpage.js +++ b/dashboard-ui/scripts/loginpage.js @@ -23,10 +23,7 @@ LoginPage.getApiClient().done(function (apiClient) { - // Show all users on localhost - var promise1 = apiClient.getPublicUsers(); - - promise1.done(function (users) { + apiClient.getPublicUsers().done(function (users) { var showManualForm = !users.length; @@ -110,6 +107,8 @@ newUrl = "index.html"; } + Dashboard.hideLoadingMsg(); + Dashboard.onServerChanged(user.Id, result.AccessToken, apiClient); Dashboard.navigate(newUrl); diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index 73fe4f7b6..45a3d33e0 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -17,6 +17,8 @@ function loadLatest(page, parentId) { + Dashboard.showLoadingMsg(); + var userId = Dashboard.getCurrentUserId(); var options = { @@ -42,6 +44,7 @@ })).lazyChildren(); + Dashboard.hideLoadingMsg(); }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 4db7a38d1..0800fe20f 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -50,13 +50,15 @@ var Dashboard = { $.event.special.swipe.verticalDistanceThreshold = 40; $.mobile.loader.prototype.options.disabled = true; - //$.mobile.page.prototype.options.domCache = true; + $.mobile.page.prototype.options.domCache = true; $.mobile.loadingMessage = false; $.mobile.loader.prototype.options.html = ""; $.mobile.loader.prototype.options.textVisible = false; $.mobile.loader.prototype.options.textOnly = true; $.mobile.loader.prototype.options.text = ""; + + $.mobile.changePage.defaults.showLoadMsg = false; }, isConnectMode: function () { @@ -481,7 +483,7 @@ var Dashboard = { setTimeout(function () { elem.active = false; - }, 300); + }, 100); } }, @@ -711,6 +713,8 @@ var Dashboard = { ConnectionManager.user(window.ApiClient).done(function (user) { Dashboard.updateUserFlyout(elem, user); }); + + require(['jqmicons']); }, updateUserFlyout: function (elem, user) { @@ -1473,7 +1477,7 @@ var Dashboard = { // The native app can handle a little bit more than safari if (AppInfo.isNativeApp) { - quality -= 20; + quality -= 15; if (isBackdrop) { quality -= 20; @@ -1782,60 +1786,70 @@ var AppInfo = {}; } - function onDocumentReady() { + function setDocumentClasses() { + + var elem = $(document.documentElement); + + if (AppInfo.enableBottomTabs) { + elem.addClass('bottomSecondaryNav'); + } if (AppInfo.isTouchPreferred) { - $(document.body).addClass('touch'); + elem.addClass('touch'); + } + + if (AppInfo.cardMargin) { + elem.addClass(AppInfo.cardMargin); + } + + if (!AppInfo.enableLatestChannelItems) { + elem.addClass('latestChannelItemsDisabled'); + } + + if (!AppInfo.enableStudioTabs) { + elem.addClass('studioTabDisabled'); + } + + if (!AppInfo.enablePeopleTabs) { + elem.addClass('peopleTabDisabled'); + } + + if (!AppInfo.enableTvEpisodesTab) { + elem.addClass('tvEpisodesTabDisabled'); + } + + if (!AppInfo.enableMusicSongsTab) { + elem.addClass('musicSongsTabDisabled'); + } + + if (!AppInfo.enableMusicArtistsTab) { + elem.addClass('musicArtistsTabDisabled'); + } + + if (!AppInfo.enableMovieTrailersTab) { + elem.addClass('movieTrailersTabDisabled'); + } + + if (!AppInfo.enableSupporterMembership) { + elem.addClass('supporterMembershipDisabled'); + } + + if (AppInfo.isNativeApp) { + elem.addClass('nativeApp'); + } + } + + function onDocumentReady() { + + // Do these now to prevent a flash of content + if (AppInfo.isNativeApp && $.browser.safari) { + Dashboard.importCss('themes/ios.css'); } if ($.browser.safari && $.browser.mobile) { initFastClick(); } - if (AppInfo.cardMargin) { - $(document.body).addClass(AppInfo.cardMargin); - } - - if (!AppInfo.enableLatestChannelItems) { - $(document.body).addClass('latestChannelItemsDisabled'); - } - - if (!AppInfo.enableStudioTabs) { - $(document.body).addClass('studioTabDisabled'); - } - - if (!AppInfo.enablePeopleTabs) { - $(document.body).addClass('peopleTabDisabled'); - } - - if (!AppInfo.enableTvEpisodesTab) { - $(document.body).addClass('tvEpisodesTabDisabled'); - } - - if (!AppInfo.enableMusicSongsTab) { - $(document.body).addClass('musicSongsTabDisabled'); - } - - if (!AppInfo.enableMusicArtistsTab) { - $(document.body).addClass('musicArtistsTabDisabled'); - } - - if (!AppInfo.enableMovieTrailersTab) { - $(document.body).addClass('movieTrailersTabDisabled'); - } - - if (!AppInfo.enableSupporterMembership) { - $(document.body).addClass('supporterMembershipDisabled'); - } - - if (AppInfo.isNativeApp) { - $(document).addClass('nativeApp'); - } - - if (AppInfo.enableBackButton) { - $(document.body).addClass('enableBackButton'); - } - var videoPlayerHtml = '