diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/paper-icon-button-light.js b/dashboard-ui/bower_components/emby-webcomponents/emby-button/paper-icon-button-light.js index 39250a7a7..b414c68a2 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/paper-icon-button-light.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/paper-icon-button-light.js @@ -48,7 +48,7 @@ } } - EmbyButtonPrototype.attachedCallback = function () { + EmbyButtonPrototype.createdCallback = function () { if (this.classList.contains('paper-icon-button-light')) { return; diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index e1304d174..f4bfef4a7 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/camerauploadsettings.html b/dashboard-ui/camerauploadsettings.html new file mode 100644 index 000000000..cc4687072 --- /dev/null +++ b/dashboard-ui/camerauploadsettings.html @@ -0,0 +1,24 @@ +
+ +
+
+ +

+ ${HeaderCameraUpload} +

+ +
+

${SelectCameraUploadServers}

+ +
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 1238c2c3e..13bf29fca 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/components/appfooter/appfooter.js b/dashboard-ui/components/appfooter/appfooter.js index 4c21e5cb4..a3be8707f 100644 --- a/dashboard-ui/components/appfooter/appfooter.js +++ b/dashboard-ui/components/appfooter/appfooter.js @@ -20,7 +20,7 @@ }); } - function dockedTabs(options) { + function appFooter(options) { var self = this; @@ -41,7 +41,7 @@ initHeadRoom(self, self.element); } - dockedTabs.prototype.destroy = function () { + appFooter.prototype.destroy = function () { var self = this; if (self.headroom) { @@ -52,5 +52,5 @@ self.element = null; }; - return dockedTabs; + return appFooter; }); \ No newline at end of file diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index 0bb7a5e4b..da9a5a722 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -56,7 +56,6 @@ bottom: 0; left: 0; right: 0; - top : 100%; /* Above everything, except for the video player and popup overlays */ z-index: 1097; color: #fff; @@ -65,8 +64,6 @@ /*box-shadow: 0 -2px 2px 0 rgba(0,0,0,.14),-1px 5px 1px rgba(0,0,0,.12);*/ will-change: transform; contain: layout style; - height: 100%; - transform: translateY(-64px); } .hiddenNowPlayingBar .nowPlayingBar { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 0d09ff734..0a3b6756b 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -533,22 +533,6 @@ progress { } } -.nativeApp *:not(input):not(select):not(textarea) { - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -webkit-touch-callout: none; - -moz-touch-callout: none; - -ms-touch-callout: none; - touch-callout: none; - -webkit-user-drag: none; - -moz-user-drag: none; - -ms-user-drag: none; - user-drag: none; -} - .syncActivityForTarget { margin: 0 0 3em 0; } diff --git a/dashboard-ui/scripts/aboutpage.js b/dashboard-ui/dashboard/aboutpage.js similarity index 100% rename from dashboard-ui/scripts/aboutpage.js rename to dashboard-ui/dashboard/aboutpage.js diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/dashboard/autoorganizelog.js similarity index 100% rename from dashboard-ui/scripts/autoorganizelog.js rename to dashboard-ui/dashboard/autoorganizelog.js diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/dashboard/autoorganizesmart.js similarity index 100% rename from dashboard-ui/scripts/autoorganizesmart.js rename to dashboard-ui/dashboard/autoorganizesmart.js diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/dashboard/autoorganizetv.js similarity index 100% rename from dashboard-ui/scripts/autoorganizetv.js rename to dashboard-ui/dashboard/autoorganizetv.js diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/dashboard/cinemamodeconfiguration.js similarity index 100% rename from dashboard-ui/scripts/cinemamodeconfiguration.js rename to dashboard-ui/dashboard/cinemamodeconfiguration.js diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/dashboard/dashboardgeneral.js similarity index 100% rename from dashboard-ui/scripts/dashboardgeneral.js rename to dashboard-ui/dashboard/dashboardgeneral.js diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/dashboard/dashboardhosting.js similarity index 100% rename from dashboard-ui/scripts/dashboardhosting.js rename to dashboard-ui/dashboard/dashboardhosting.js diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/dashboard/devicesupload.js similarity index 100% rename from dashboard-ui/scripts/devicesupload.js rename to dashboard-ui/dashboard/devicesupload.js diff --git a/dashboard-ui/scripts/librarydisplay.js b/dashboard-ui/dashboard/librarydisplay.js similarity index 100% rename from dashboard-ui/scripts/librarydisplay.js rename to dashboard-ui/dashboard/librarydisplay.js diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/dashboard/librarysettings.js similarity index 100% rename from dashboard-ui/scripts/librarysettings.js rename to dashboard-ui/dashboard/librarysettings.js diff --git a/dashboard-ui/scripts/livetvtunerprovider-satip.js b/dashboard-ui/dashboard/livetvtunerprovider-satip.js similarity index 100% rename from dashboard-ui/scripts/livetvtunerprovider-satip.js rename to dashboard-ui/dashboard/livetvtunerprovider-satip.js diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/dashboard/logpage.js similarity index 100% rename from dashboard-ui/scripts/logpage.js rename to dashboard-ui/dashboard/logpage.js diff --git a/dashboard-ui/scripts/wizardcomponents.js b/dashboard-ui/dashboard/wizardcomponents.js similarity index 100% rename from dashboard-ui/scripts/wizardcomponents.js rename to dashboard-ui/dashboard/wizardcomponents.js diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/dashboard/wizardfinishpage.js similarity index 100% rename from dashboard-ui/scripts/wizardfinishpage.js rename to dashboard-ui/dashboard/wizardfinishpage.js diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 2cb4cf359..9f71cff17 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -43,7 +43,7 @@ body:not(.dashboardDocument) .mainDrawerButton { .emby-tab-button { font-weight: 400; - text-transform: none; + text-transform: none!important; border-color: transparent !important; border-width: 0 !important; } diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html index dbb1283f6..df4c89b3f 100644 --- a/dashboard-ui/devicesupload.html +++ b/dashboard-ui/devicesupload.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/legacy/selectmenu.js b/dashboard-ui/legacy/selectmenu.js index cc230fd68..959b8d617 100644 --- a/dashboard-ui/legacy/selectmenu.js +++ b/dashboard-ui/legacy/selectmenu.js @@ -1,5 +1,7 @@ -// TODO: This needs to be deprecated, but it's used heavily by plugins -$.fn.selectmenu = function () { - // No-op. This implementation only exists to prevent script errors - return this; -}; \ No newline at end of file +define(['jQuery'], function ($) { + // TODO: This needs to be deprecated, but it's used heavily by plugins + $.fn.selectmenu = function () { + // No-op. This implementation only exists to prevent script errors + return this; + }; +}); \ No newline at end of file diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html index 5ad8f2bd8..ea89e1b18 100644 --- a/dashboard-ui/mypreferencesmenu.html +++ b/dashboard-ui/mypreferencesmenu.html @@ -1,4 +1,4 @@ -
+
@@ -6,7 +6,7 @@
- + tv
${ButtonDisplaySettings}
${ButtonDisplaySettingsHelp}
@@ -16,7 +16,7 @@
- + home
${ButtonHomeScreenSettings}
${ButtonHomeScreenSettingsHelp}
@@ -26,7 +26,7 @@
- + play_circle_filled
${ButtonPlaybackSettings}
${ButtonPlaybackSettingsHelp}
@@ -36,7 +36,7 @@
- + person
${ButtonProfile}
${ButtonProfileHelp}
@@ -44,12 +44,20 @@
+ +
+ photo +
+
${TabCameraUpload}
+
+
+ +
- -
-
${ButtonSyncSettings}
-
${ButtonSyncSettingsHelp}
+ file_download +
+
${HeaderOfflineSync}
 @@ -60,15 +68,15 @@
- -
+ wifi +
${HeaderSelectServer}
- -
+ lock +
${ButtonSignOut}
@@ -81,8 +89,8 @@
- -
+ settings +
${ButtonServerDashboard}
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html index 43dced84a..fe6d060a1 100644 --- a/dashboard-ui/mysyncsettings.html +++ b/dashboard-ui/mysyncsettings.html @@ -4,7 +4,7 @@

- ${HeaderSync} + ${HeaderOfflineSync}


@@ -20,21 +20,10 @@
-

- ${HeaderCameraUpload} -

- -

${SelectCameraUploadServers}

- -
-
-
- -