diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html index 6d5c93c339..9dda062feb 100644 --- a/dashboard-ui/connectlogin.html +++ b/dashboard-ui/connectlogin.html @@ -10,7 +10,7 @@
-

${HeaderPleaseSignIn}

+

${HeaderSignInWithConnect}

diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 7cfa541386..63ed2126d7 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -13,7 +13,6 @@ ${TabDashboard} ${TabSettings} ${TabSecurity} -
diff --git a/dashboard-ui/dashboardsync.html b/dashboard-ui/dashboardsync.html index 18dbca76f2..d04e60b95c 100644 --- a/dashboard-ui/dashboardsync.html +++ b/dashboard-ui/dashboardsync.html @@ -4,16 +4,15 @@ ${TitleServer} -
+
- ${TabDashboard} - ${TabSettings} - ${TabSecurity} - ${TabSync} + ${TabDevices} + ${TabCameraUpload} + ${TabSync}
diff --git a/dashboard-ui/devices.html b/dashboard-ui/devices.html index 10025c263b..72c3ebbab5 100644 --- a/dashboard-ui/devices.html +++ b/dashboard-ui/devices.html @@ -12,12 +12,13 @@
${TabDevices} ${TabCameraUpload} + ${TabSync}
- - + +
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html index 28fda543f7..5fbfc5aef4 100644 --- a/dashboard-ui/devicesupload.html +++ b/dashboard-ui/devicesupload.html @@ -12,9 +12,9 @@
${TabDevices} ${TabCameraUpload} + ${TabSync}
-

${HeaderCameraUploadHelp}

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index d429b2512c..c830512953 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -66,15 +66,21 @@ clearProgressInterval(); - var intervalTime = ApiClient.isWebSocketOpen() ? 1200 : 20000; + var intervalTime = ApiClient.isWebSocketOpen() ? 1200 : 5000; + self.lastProgressReport = 0; currentProgressInterval = setInterval(function () { if (self.currentMediaElement) { - sendProgressUpdate(); + + if ((new Date().getTime() - self.lastProgressReport) > intervalTime) { + + self.lastProgressReport = new Date().getTime(); + sendProgressUpdate(); + } } - }, intervalTime); + }, 250); }; self.getCurrentMediaExtension = function (currentSrc) { @@ -779,7 +785,7 @@ self.setVolume(self.getSavedVolume() * 100); }; - self.volume = function() { + self.volume = function () { return self.currentMediaElement.volume * 100; }; @@ -1333,12 +1339,18 @@ self.onPlaystateChange(this); + // In the event timeupdate isn't firing, at least we can update when this happens + self.setCurrentTime(self.getCurrentTicks()); + }).on("playing.mediaplayerevent", function () { console.log('audio element event: playing'); self.onPlaystateChange(this); + // In the event timeupdate isn't firing, at least we can update when this happens + self.setCurrentTime(self.getCurrentTicks()); + }).on("timeupdate.mediaplayerevent", function () { self.setCurrentTime(self.getCurrentTicks(this)); diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 2d87da7349..f69619c114 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -2,7 +2,7 @@ var pageSizeKey = 'people'; - var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); // The base query options var query = { diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index 4dbc55138b..3655b2047a 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -1,6 +1,6 @@ (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); // The base query options var query = { diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index 4229f6e1ff..006a2ecfd7 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -2,7 +2,7 @@ var pageSizeKey = 'people'; - var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); // The base query options var query = { diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 9ee5d3599a..071f286c82 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -110,7 +110,6 @@ function isAvailable(item, user) { - return false; return item.SupportsSync; } diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html index 935212024d..23ff8ae850 100644 --- a/dashboard-ui/serversecurity.html +++ b/dashboard-ui/serversecurity.html @@ -13,7 +13,6 @@ ${TabDashboard} ${TabSettings} ${TabSecurity} -