From f52a94d778ef460f91fd7036f0944c9eeea9b68b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti
${CinemaModeConfigurationHelp2} ${DrmChannelsNotImported}
-
+
-
+
-
+
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index be322d7279..df7a9eb079 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -111,6 +111,10 @@
margin-left: .5em;
}
+ [is="emby-button"] span + i {
+ margin-left: .5em;
+ }
+
[is="emby-button"]:not(.autoSize) i {
font-size: 24px;
width: 24px;
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 73276f836d..3cb858f875 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -49,7 +49,7 @@
-
+
${HeadersFolders}
${HeadersFolders}
@@ -131,7 +131,7 @@
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index e17dd2477d..e8eb9a104b 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -31,7 +31,7 @@
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index 8827d4a55f..70e9c7e734 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -12,7 +12,7 @@
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 4279b39e29..fe444d6542 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -102,7 +102,7 @@
${HeaderHttpHeaders}
${HeaderXmlDocumentAttributes}
-
-
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 473eeea010..814f210751 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -64,7 +64,7 @@
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index dc64beaee4..057017446f 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -69,7 +69,7 @@
-
+
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 557feee496..d5ecab12f6 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -26,7 +26,7 @@
-
+
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index b153783542..5de5e4c704 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -26,7 +26,7 @@
-
+
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 77d3671803..0a2a270f9a 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -57,9 +57,9 @@
@@ -42,11 +42,11 @@
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 7fca9fcf28..a687598a5a 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -10,7 +10,7 @@
${HeaderTunerDevices}
${HeaderGuideProviders}
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 9543e577b7..2ddf31da34 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -42,7 +42,7 @@
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 1f58f7a0bb..de7b08cfc7 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -45,7 +45,7 @@
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 055193c743..b748d46e8d 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -58,7 +58,7 @@
-
+
-
+
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index ee45541463..ae6b51eaaf 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -11,7 +11,7 @@
${HeaderTaskTriggers}
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index bded8eafba..5a8cc4d120 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'emby-icons'], function ($) {
+define(['jQuery', 'apphost'], function ($, appHost) {
function changeCollectionType(page, virtualFolder) {
@@ -112,7 +112,7 @@
menuItems.push({
name: Globalize.translate('ButtonManageFolders'),
id: 'edit',
- ironIcon: 'folder-open'
+ ironIcon: 'folder_open'
});
menuItems.push({
@@ -124,7 +124,7 @@
menuItems.push({
name: Globalize.translate('ButtonRename'),
id: 'rename',
- ironIcon: 'mode-edit'
+ ironIcon: 'mode_edit'
});
require(['actionsheet'], function (actionsheet) {
@@ -180,7 +180,7 @@
virtualFolders.push({
Name: Globalize.translate('ButtonAddMediaLibrary'),
- icon: 'add-circle',
+ icon: 'add_circle',
Locations: [],
showType: false,
showLocations: false,
@@ -313,7 +313,7 @@
html += '';
} else if (!virtualFolder.showNameWithIcon) {
html += '';
html += '
@@ -56,7 +56,7 @@
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 4c9fa8c8a0..faecd6d009 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -40,9 +40,9 @@
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index da8b88b449..5ba90445ac 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -28,7 +28,7 @@
${LabelBlockContentWithTags}
${WindowsServiceIntro2}
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html index bbcaee8a50..7ce1652c95 100644 --- a/dashboard-ui/wizardsettings.html +++ b/dashboard-ui/wizardsettings.html @@ -29,8 +29,8 @@ diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html index 9f5a6e293d..395167dae4 100644 --- a/dashboard-ui/wizardstart.html +++ b/dashboard-ui/wizardstart.html @@ -22,7 +22,7 @@