diff --git a/dashboard-ui/thirdparty/apiclient/ajax.js b/dashboard-ui/apiclient/ajax.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/ajax.js rename to dashboard-ui/apiclient/ajax.js diff --git a/dashboard-ui/thirdparty/apiclient/alt/ajax.js b/dashboard-ui/apiclient/alt/ajax.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/alt/ajax.js rename to dashboard-ui/apiclient/alt/ajax.js diff --git a/dashboard-ui/thirdparty/apiclient/alt/bean.js b/dashboard-ui/apiclient/alt/bean.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/alt/bean.js rename to dashboard-ui/apiclient/alt/bean.js diff --git a/dashboard-ui/thirdparty/apiclient/alt/deferred.js b/dashboard-ui/apiclient/alt/deferred.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/alt/deferred.js rename to dashboard-ui/apiclient/alt/deferred.js diff --git a/dashboard-ui/thirdparty/apiclient/alt/events.js b/dashboard-ui/apiclient/alt/events.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/alt/events.js rename to dashboard-ui/apiclient/alt/events.js diff --git a/dashboard-ui/thirdparty/apiclient/apiclient.js b/dashboard-ui/apiclient/apiclient.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/apiclient.js rename to dashboard-ui/apiclient/apiclient.js diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/connectionmanager.js rename to dashboard-ui/apiclient/connectionmanager.js diff --git a/dashboard-ui/thirdparty/apiclient/connectservice.js b/dashboard-ui/apiclient/connectservice.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/connectservice.js rename to dashboard-ui/apiclient/connectservice.js diff --git a/dashboard-ui/thirdparty/apiclient/credentials.js b/dashboard-ui/apiclient/credentials.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/credentials.js rename to dashboard-ui/apiclient/credentials.js diff --git a/dashboard-ui/thirdparty/apiclient/deferred.js b/dashboard-ui/apiclient/deferred.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/deferred.js rename to dashboard-ui/apiclient/deferred.js diff --git a/dashboard-ui/thirdparty/apiclient/device.js b/dashboard-ui/apiclient/device.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/device.js rename to dashboard-ui/apiclient/device.js diff --git a/dashboard-ui/thirdparty/apiclient/events.js b/dashboard-ui/apiclient/events.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/events.js rename to dashboard-ui/apiclient/events.js diff --git a/dashboard-ui/thirdparty/apiclient/localassetmanager.js b/dashboard-ui/apiclient/localassetmanager.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/localassetmanager.js rename to dashboard-ui/apiclient/localassetmanager.js diff --git a/dashboard-ui/thirdparty/apiclient/logger.js b/dashboard-ui/apiclient/logger.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/logger.js rename to dashboard-ui/apiclient/logger.js diff --git a/dashboard-ui/thirdparty/apiclient/md5.js b/dashboard-ui/apiclient/md5.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/md5.js rename to dashboard-ui/apiclient/md5.js diff --git a/dashboard-ui/thirdparty/apiclient/serverdiscovery.js b/dashboard-ui/apiclient/serverdiscovery.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/serverdiscovery.js rename to dashboard-ui/apiclient/serverdiscovery.js diff --git a/dashboard-ui/thirdparty/apiclient/sha1.js b/dashboard-ui/apiclient/sha1.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/sha1.js rename to dashboard-ui/apiclient/sha1.js diff --git a/dashboard-ui/thirdparty/apiclient/store.js b/dashboard-ui/apiclient/store.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/store.js rename to dashboard-ui/apiclient/store.js diff --git a/dashboard-ui/thirdparty/apiclient/wakeonlan.js b/dashboard-ui/apiclient/wakeonlan.js similarity index 100% rename from dashboard-ui/thirdparty/apiclient/wakeonlan.js rename to dashboard-ui/apiclient/wakeonlan.js diff --git a/dashboard-ui/thirdparty/cordova/android/androidcredentials.js b/dashboard-ui/cordova/android/androidcredentials.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/androidcredentials.js rename to dashboard-ui/cordova/android/androidcredentials.js diff --git a/dashboard-ui/thirdparty/cordova/android/appstorage.js b/dashboard-ui/cordova/android/appstorage.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/appstorage.js rename to dashboard-ui/cordova/android/appstorage.js diff --git a/dashboard-ui/thirdparty/cordova/android/filesystem.js b/dashboard-ui/cordova/android/filesystem.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/filesystem.js rename to dashboard-ui/cordova/android/filesystem.js diff --git a/dashboard-ui/thirdparty/cordova/android/iap.js b/dashboard-ui/cordova/android/iap.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/iap.js rename to dashboard-ui/cordova/android/iap.js diff --git a/dashboard-ui/thirdparty/cordova/android/immersive.js b/dashboard-ui/cordova/android/immersive.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/immersive.js rename to dashboard-ui/cordova/android/immersive.js diff --git a/dashboard-ui/thirdparty/cordova/android/localassetmanager.js b/dashboard-ui/cordova/android/localassetmanager.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/localassetmanager.js rename to dashboard-ui/cordova/android/localassetmanager.js diff --git a/dashboard-ui/thirdparty/cordova/android/mediasession.js b/dashboard-ui/cordova/android/mediasession.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/mediasession.js rename to dashboard-ui/cordova/android/mediasession.js diff --git a/dashboard-ui/thirdparty/cordova/android/nativedirectorychooser.js b/dashboard-ui/cordova/android/nativedirectorychooser.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/nativedirectorychooser.js rename to dashboard-ui/cordova/android/nativedirectorychooser.js diff --git a/dashboard-ui/thirdparty/cordova/android/vlcplayer.js b/dashboard-ui/cordova/android/vlcplayer.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/android/vlcplayer.js rename to dashboard-ui/cordova/android/vlcplayer.js diff --git a/dashboard-ui/thirdparty/cordova/back.js b/dashboard-ui/cordova/back.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/back.js rename to dashboard-ui/cordova/back.js diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/cordova/chromecast.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/chromecast.js rename to dashboard-ui/cordova/chromecast.js diff --git a/dashboard-ui/thirdparty/cordova/connectsdk.js b/dashboard-ui/cordova/connectsdk.js similarity index 90% rename from dashboard-ui/thirdparty/cordova/connectsdk.js rename to dashboard-ui/cordova/connectsdk.js index 7b3a4416b5..d0216edb5c 100644 --- a/dashboard-ui/thirdparty/cordova/connectsdk.js +++ b/dashboard-ui/cordova/connectsdk.js @@ -16,7 +16,7 @@ manager.startDiscovery(); - requirejs(['thirdparty/cordova/chromecast', 'thirdparty/cordova/generaldevice']); + requirejs(['cordova/chromecast', 'cordova/generaldevice']); } function onDeviceListChanged(list) { diff --git a/dashboard-ui/thirdparty/cordova/externalplayer.js b/dashboard-ui/cordova/externalplayer.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/externalplayer.js rename to dashboard-ui/cordova/externalplayer.js diff --git a/dashboard-ui/thirdparty/cordova/filesystem.js b/dashboard-ui/cordova/filesystem.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/filesystem.js rename to dashboard-ui/cordova/filesystem.js diff --git a/dashboard-ui/thirdparty/cordova/generaldevice.js b/dashboard-ui/cordova/generaldevice.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/generaldevice.js rename to dashboard-ui/cordova/generaldevice.js diff --git a/dashboard-ui/thirdparty/cordova/iap.js b/dashboard-ui/cordova/iap.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/iap.js rename to dashboard-ui/cordova/iap.js diff --git a/dashboard-ui/thirdparty/cordova/imagestore.js b/dashboard-ui/cordova/imagestore.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/imagestore.js rename to dashboard-ui/cordova/imagestore.js diff --git a/dashboard-ui/thirdparty/cordova/ios/actionsheet.js b/dashboard-ui/cordova/ios/actionsheet.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/ios/actionsheet.js rename to dashboard-ui/cordova/ios/actionsheet.js diff --git a/dashboard-ui/thirdparty/cordova/ios/orientation.js b/dashboard-ui/cordova/ios/orientation.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/ios/orientation.js rename to dashboard-ui/cordova/ios/orientation.js diff --git a/dashboard-ui/thirdparty/cordova/registrationservices.js b/dashboard-ui/cordova/registrationservices.js similarity index 98% rename from dashboard-ui/thirdparty/cordova/registrationservices.js rename to dashboard-ui/cordova/registrationservices.js index 0b407124f2..a84fd8ecfb 100644 --- a/dashboard-ui/thirdparty/cordova/registrationservices.js +++ b/dashboard-ui/cordova/registrationservices.js @@ -243,9 +243,9 @@ } if (isAndroid()) { - requirejs(['thirdparty/cordova/android/iap'], onIapManagerLoaded); + requirejs(['cordova/android/iap'], onIapManagerLoaded); } else { - requirejs(['thirdparty/cordova/iap'], onIapManagerLoaded); + requirejs(['cordova/iap'], onIapManagerLoaded); } })(); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/cordova/remotecontrols.js b/dashboard-ui/cordova/remotecontrols.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/remotecontrols.js rename to dashboard-ui/cordova/remotecontrols.js diff --git a/dashboard-ui/thirdparty/cordova/serverdiscovery.js b/dashboard-ui/cordova/serverdiscovery.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/serverdiscovery.js rename to dashboard-ui/cordova/serverdiscovery.js diff --git a/dashboard-ui/thirdparty/cordova/volume.js b/dashboard-ui/cordova/volume.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/volume.js rename to dashboard-ui/cordova/volume.js diff --git a/dashboard-ui/thirdparty/cordova/wakeonlan.js b/dashboard-ui/cordova/wakeonlan.js similarity index 100% rename from dashboard-ui/thirdparty/cordova/wakeonlan.js rename to dashboard-ui/cordova/wakeonlan.js diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index 7c8a347941..0d1357c271 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -166,12 +166,9 @@ input[type="range"]::-ms-fill-upper { display: none; } - .remoteControlButton { - float: right; - } - - .nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton { + .remoteControlButton, .nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton { float: right; + padding-top: 0; } .nowPlayingBar .currentTime, .nowPlayingBar .positionSliderContainer, .nowPlayingBar .volumeSliderContainer, #nowPlayingBar .muteButton, #nowPlayingBar .unmuteButton { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 85018e8c47..0bc2e8c935 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -420,42 +420,48 @@ if (commands.indexOf('addtocollection') != -1) { items.push({ name: Globalize.translate('ButtonAddToCollection'), - id: 'addtocollection' + id: 'addtocollection', + ironIcon: 'add' }); } if (commands.indexOf('playlist') != -1) { items.push({ name: Globalize.translate('ButtonAddToPlaylist'), - id: 'playlist' + id: 'playlist', + ironIcon: 'playlist-add' }); } if (commands.indexOf('delete') != -1) { items.push({ name: Globalize.translate('ButtonDelete'), - id: 'delete' + id: 'delete', + ironIcon: 'delete' }); } if (commands.indexOf('download') != -1) { items.push({ name: Globalize.translate('ButtonDownload'), - id: 'download' + id: 'download', + ironIcon: 'file-download' }); } if (commands.indexOf('edit') != -1) { items.push({ name: Globalize.translate('ButtonEdit'), - id: 'edit' + id: 'edit', + ironIcon: 'mode-edit' }); } if (commands.indexOf('refresh') != -1) { items.push({ name: Globalize.translate('ButtonRefresh'), - id: 'refresh' + id: 'refresh', + ironIcon: 'refresh' }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 9576576951..cfd572976d 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1603,7 +1603,7 @@ var Dashboard = { require(['scripts/externalplayer.js'], function () { if (Dashboard.isRunningInCordova()) { - require(['thirdparty/cordova/externalplayer.js'], function () { + require(['cordova/externalplayer.js'], function () { deferred.resolve(); }); @@ -1961,14 +1961,14 @@ var AppInfo = {}; require(['filesystem']); if (Dashboard.isRunningInCordova()) { - require(['thirdparty/cordova/connectsdk', 'scripts/registrationservices', 'thirdparty/cordova/volume', 'thirdparty/cordova/back']); + require(['cordova/connectsdk', 'scripts/registrationservices', 'cordova/volume', 'cordova/back']); if ($.browser.android) { - require(['thirdparty/cordova/android/androidcredentials', 'thirdparty/cordova/android/immersive', 'thirdparty/cordova/android/mediasession']); + require(['cordova/android/androidcredentials', 'cordova/android/immersive', 'cordova/android/mediasession']); } if ($.browser.safari) { - require(['thirdparty/cordova/remotecontrols', 'thirdparty/cordova/ios/orientation']); + require(['cordova/remotecontrols', 'cordova/ios/orientation']); } } else { @@ -1998,42 +1998,42 @@ var AppInfo = {}; }); if (Dashboard.isRunningInCordova() && $.browser.android) { - define("appstorage", ["thirdparty/cordova/android/appstorage"]); + define("appstorage", ["cordova/android/appstorage"]); } else { define('appstorage', [], function () { return appStorage; }); } if (Dashboard.isRunningInCordova()) { - define("serverdiscovery", ["thirdparty/cordova/serverdiscovery"]); - define("wakeonlan", ["thirdparty/cordova/wakeonlan"]); + define("serverdiscovery", ["cordova/serverdiscovery"]); + define("wakeonlan", ["cordova/wakeonlan"]); } else { - define("serverdiscovery", ["thirdparty/apiclient/serverdiscovery"]); - define("wakeonlan", ["thirdparty/apiclient/wakeonlan"]); + define("serverdiscovery", ["apiclient/serverdiscovery"]); + define("wakeonlan", ["apiclient/wakeonlan"]); } if (Dashboard.isRunningInCordova() && $.browser.android) { - define("localassetmanager", ["thirdparty/cordova/android/localassetmanager"]); + define("localassetmanager", ["cordova/android/localassetmanager"]); } else { - define("localassetmanager", ["thirdparty/apiclient/localassetmanager"]); + define("localassetmanager", ["apiclient/localassetmanager"]); } if (Dashboard.isRunningInCordova() && $.browser.android) { - define("filesystem", ["thirdparty/cordova/android/filesystem"]); + define("filesystem", ["cordova/android/filesystem"]); } else if (Dashboard.isRunningInCordova()) { - define("filesystem", ["thirdparty/cordova/filesystem"]); + define("filesystem", ["cordova/filesystem"]); } else { define("filesystem", ["thirdparty/filesystem"]); } if (Dashboard.isRunningInCordova() && $.browser.android) { - define("nativedirectorychooser", ["thirdparty/cordova/android/nativedirectorychooser"]); + define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]); } if (Dashboard.isRunningInCordova() && $.browser.android) { - define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]); + define("audiorenderer", ["cordova/android/vlcplayer"]); //define("audiorenderer", ["scripts/htmlmediarenderer"]); define("videorenderer", ["scripts/htmlmediarenderer"]); } @@ -2042,7 +2042,7 @@ var AppInfo = {}; define("videorenderer", ["scripts/htmlmediarenderer"]); } - define("connectservice", ["thirdparty/apiclient/connectservice"]); + define("connectservice", ["apiclient/connectservice"]); define("paperbuttonstyle", [], function () { Dashboard.importCss('thirdparty/paper-button-style.css'); return {}; @@ -2053,7 +2053,7 @@ var AppInfo = {}; }); if (Dashboard.isRunningInCordova() && $.browser.safari) { - define("actionsheet", ["thirdparty/cordova/ios/actionsheet"]); + define("actionsheet", ["cordova/ios/actionsheet"]); } else { define("actionsheet", ["scripts/actionsheet"]); } @@ -2091,7 +2091,7 @@ var AppInfo = {}; function initCordovaWithDeviceId(deferred, deviceId) { - require(['thirdparty/cordova/imagestore']); + require(['cordova/imagestore']); var capablities = Dashboard.capabilities(); diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html index fcb967c220..71a98728c8 100644 --- a/dashboard-ui/thirdparty/emby-icons.html +++ b/dashboard-ui/thirdparty/emby-icons.html @@ -43,6 +43,8 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for + + diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js index 3bb47b54c4..f53f271b02 100644 --- a/dashboard-ui/thirdparty/jquery.unveil-custom.js +++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js @@ -23,7 +23,7 @@ return 8000; } - var screens = $.browser.mobile ? 2 : 1; + var screens = $.browser.mobile ? 2.5 : 1; // This helps eliminate the draw-in effect as you scroll return Math.max(screen.availHeight * screens, 1000); diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index ec597d2ac1..6138c54b6b 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -196,6 +196,7 @@ paper-button.notext { paper-dialog { border-radius: 4px; + z-index: 999999 !important; } iron-overlay-backdrop { diff --git a/dashboard-ui/vulcanize-in.html b/dashboard-ui/vulcanize-in.html new file mode 100644 index 0000000000..dcdb002287 --- /dev/null +++ b/dashboard-ui/vulcanize-in.html @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html new file mode 100644 index 0000000000..07b8f3e465 --- /dev/null +++ b/dashboard-ui/vulcanize-out.html @@ -0,0 +1,12258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/vulcanize.txt b/dashboard-ui/vulcanize.txt new file mode 100644 index 0000000000..021276cf48 --- /dev/null +++ b/dashboard-ui/vulcanize.txt @@ -0,0 +1 @@ +vulcanize vulcanize-in.html > vulcanize-out.html --strip-comments --inline-scripts --inline-css \ No newline at end of file