diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 68dcb63aa3..040f0044a8 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -908,6 +908,26 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { background: rgba(248, 58, 34, .8); } +.syncIndicator { + display: block; + position: absolute; + top: 32px; + right: 5px; + text-align: center; + vertical-align: middle; + width: 24px; + height: 19px; + padding-top: 3px; + border-radius: 50%; + color: #fff; + background: rgba(51, 136, 204, .8); + line-height: 16px; +} + +.syncWorkingIndicator { + background: rgba(255, 106, 0, .8); +} + .playedIndicator { display: block; position: absolute; @@ -1387,7 +1407,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .ui-page-theme-b .listItem:hover a { - background-color: #333 !important; + background-color: rgba(51,51,51,.6) !important; } @media all and (max-width: 600px) { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 79b9b9cb12..9dc9e25785 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -282,7 +282,7 @@ } } -@media all and (max-width: 1000px) { +@media all and (max-width: 1440px) { /* They can use the left menu */ .dashboardEntryHeaderButton { diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css index d2c5e5415a..e9ec234649 100644 --- a/dashboard-ui/css/notifications.css +++ b/dashboard-ui/css/notifications.css @@ -12,8 +12,8 @@ font-weight: 300; display: none; position: relative; - top: -6px; - padding: 5px 10px; + top: -4px; + padding: 3px 8px; border-radius: 1000px; } diff --git a/dashboard-ui/css/voice.css b/dashboard-ui/css/voice.css new file mode 100644 index 0000000000..45fe2198c4 --- /dev/null +++ b/dashboard-ui/css/voice.css @@ -0,0 +1,51 @@ +.voiceInputHelp { + background-image: url(images/splash.jpg); + top: 50px; + left: 0; + right: 0; + bottom: 0; + position: fixed; + background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; + z-index: 999999; +} + +.voiceInputHelpInner { + background: rgba(10,10,10,.8); + width: 100%; + height: 100%; + color: #eee; +} + +.voiceHelpContent { + max-width: 600px; + margin: auto; + padding: 1em 1em 0; +} + +.exampleCommands { + font-size: 15px; +} + +.exampleCommand { + margin: 1em 0; +} + + .exampleCommand .fa { + vertical-align: middle; + color: #3388cc; + } + +.exampleCommandText { + margin: 0 1em; +} + +.defaultVoiceHelp { + margin-bottom: 2em; +} + +.voiceInputContainer { + margin: 1.5em 0; + font-size: 15px; +} diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 8e0f094ab5..241c9a583c 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -27,7 +27,7 @@
- +
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index b0c0e62ba3..24e3a50980 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -137,7 +137,7 @@
- ${ButtonSync} + ${ButtonSync}
@@ -146,7 +146,7 @@
- ${ButtonSync} + ${ButtonSync}

diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 4fc2c2429e..855ec87e62 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -145,7 +145,7 @@ ${ButtonPlayTrailer} ${ButtonPlay} - ${ButtonSync} + ${ButtonSync} @@ -172,7 +172,7 @@ ${ButtonPlayTrailer} ${ButtonPlay} - ${ButtonSync} + ${ButtonSync}

diff --git a/dashboard-ui/kids.html b/dashboard-ui/kids.html index 9f0af0fae6..1856eb7cbe 100644 --- a/dashboard-ui/kids.html +++ b/dashboard-ui/kids.html @@ -5,7 +5,7 @@
-
+
@@ -75,11 +75,6 @@
- -
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index 5751de9ebe..1d026cbfe3 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -41,7 +41,7 @@ - ${ButtonSync} + ${ButtonSync} diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index 9ef904a0d6..bbaeff0675 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -23,7 +23,7 @@ '; @@ -51,8 +55,20 @@ if (user.localUser) { $('.btnCast', header).show(); $('.headerSearchButton', header).show(); + + requirejs(['scripts/voice'], function () { + + if (VoiceInputManager.isSupported()) { + $('.headerVoiceButton', header).show(); + } else { + $('.headerVoiceButton', header).hide(); + } + + }); + } else { $('.btnCast', header).hide(); + $('.headerVoiceButton', header).hide(); $('.headerSearchButton', header).hide(); } @@ -324,7 +340,7 @@ html += '' + Globalize.translate('ButtonRemote') + ''; - html += '' + Globalize.translate('ButtonSync') + ''; + html += '' + Globalize.translate('ButtonSync') + ''; html += '
'; diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index 044633a512..1b84c53bc6 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -176,7 +176,7 @@ }); } - $(document).on('pageshow', "#liveTvStatusPage", function () { + $(document).on('pageshowready', "#liveTvStatusPage", function () { var page = this; diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 9cb076fa2f..15a7a80bc5 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1110,12 +1110,12 @@ // Can't autoplay in these browsers so we need to use the full controls if (requiresNativeControls) { - html += '
- +

diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html index 456eab7831..f869faa23b 100644 --- a/dashboard-ui/syncsettings.html +++ b/dashboard-ui/syncsettings.html @@ -4,7 +4,7 @@ ${TitleSync} -
+
@@ -58,9 +58,6 @@
-
diff --git a/dashboard-ui/thirdparty/cordova/android/filesystem.js b/dashboard-ui/thirdparty/cordova/android/filesystem.js index f8f21de5e9..b139ba67da 100644 --- a/dashboard-ui/thirdparty/cordova/android/filesystem.js +++ b/dashboard-ui/thirdparty/cordova/android/filesystem.js @@ -3,6 +3,7 @@ window.FileSystem = { fileExists: function (path) { + return false; return NativeFileSystem.fileExists(path); }, diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html index 07a1c15318..eb9c80b1b6 100644 --- a/dashboard-ui/tvlatest.html +++ b/dashboard-ui/tvlatest.html @@ -19,7 +19,7 @@

${HeaderLatestEpisodes}

- ${ButtonSync} + ${ButtonSync}
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index e6a1b09c44..b60f4ed264 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -29,7 +29,7 @@