diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 69a21bdbe7..72287fb0f5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
- "version": "1.4.292",
- "_release": "1.4.292",
+ "version": "1.4.294",
+ "_release": "1.4.294",
"_resolution": {
"type": "version",
- "tag": "1.4.292",
- "commit": "42bd91dd686bbe14a0126e620d0fececb757516b"
+ "tag": "1.4.294",
+ "commit": "261889a750a63f93e456622c6882d18bb9248626"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css
index e4d4f32a55..3149ba5da3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css
@@ -9,7 +9,7 @@
}
.actionsheet-not-fullscreen {
- background-color: #262626;
+ background-color: #2a2a2a;
}
.actionSheetMenuItem:hover {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
index 579af58d97..ae7d10668d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
@@ -560,12 +560,23 @@ button {
.backdropCard-scalable {
width: 20%;
}
+
+ .squareCard-scalable {
+ width: 12.5%;
+ }
}
@media all and (min-width: 1800px) {
+ .smallBackdropCard-scalable {
+ width: 10%;
+ }
+}
+
+@media all and (min-width: 1920px) {
+
.squareCard-scalable {
- width: 12.5%;
+ width: 11.111111111111111111111111111111%;
}
.smallBackdropCard-scalable {
@@ -575,10 +586,6 @@ button {
@media all and (min-width: 2100px) {
- .squareCard-scalable {
- width: 11.111111111111111111111111111111%;
- }
-
.backdropCard-scalable {
width: 20%;
}
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js
index 6946b252df..d73efd038f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js
@@ -31,7 +31,14 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
if ((item.Type == 'Timer') && user.Policy.EnableLiveTvManagement && options.cancelTimer !== false) {
commands.push({
- name: globalize.translate('sharedcomponents#ButtonCancel'),
+ name: globalize.translate('sharedcomponents#CancelRecording'),
+ id: 'canceltimer'
+ });
+ }
+
+ if ((item.Type == 'Recording' && item.Status == 'InProgress') && user.Policy.EnableLiveTvManagement && options.cancelTimer !== false) {
+ commands.push({
+ name: globalize.translate('sharedcomponents#CancelRecording'),
id: 'canceltimer'
});
}
@@ -500,7 +507,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
require(['recordingHelper'], function (recordingHelper) {
- recordingHelper.cancelTimerWithConfirmation(item.Id, item.ServerId).then(function() {
+ var timerId = item.TimerId || item.Id;
+
+ recordingHelper.cancelTimerWithConfirmation(timerId, item.ServerId).then(function () {
getResolveFunction(resolve, command, true)();
});
});
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js
index 13125ab0b7..ba96c2c2b1 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js
@@ -246,7 +246,7 @@
showOverlayTimeout = setTimeout(function () {
onShowTimerExpired(card);
- }, 1200);
+ }, 1400);
}
function preventTouchHover() {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
index 07a1c89cfa..41a87c51da 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
index 3c1b151515..a9777a2018 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\u0414\u043e\u0431\u0430\u0432\u0438",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
index 7f14be53f0..77caf214fc 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Afegeix",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json b/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
index 9cb7851e08..59c79dc567 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "P\u0159idat",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
index a0f9a7a2f2..63d51a44a9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Del",
"Add": "Tilf\u00f8j",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
index 0324794882..d384a62715 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Serie abgebrochen.",
"HeaderKeepSeries": "Serie behalten",
"HeaderCancelSeries": "Serie abbrechen",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Teilen",
"Add": "Hinzuf\u00fcgen",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
index 2f28f46785..0096fdcbe0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
index 7bd599e08d..7a18ad7b71 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json
index 094c4e4b05..4e33b201a5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json
@@ -280,6 +280,7 @@
"RepeatEpisodes": "Repeat episodes",
"DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription.",
"HeaderCancelRecording": "Cancel Recording",
+ "CancelRecording": "Cancel recording",
"HeaderKeepRecording": "Keep Recording",
"HeaderCancelSeries": "Cancel Series",
"HeaderKeepSeries": "Keep Series",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
index 207e3fee2a..a94c10bb22 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
index 82776c25e8..3329d4bb07 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Compartir",
"Add": "Agregar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
index 5aa3ef8182..c65f53a898 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Compartir",
"Add": "A\u00f1adir",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
index 6512688b22..facf2379ad 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
index 437091be20..405ff2ba5e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
index 145c7b1583..48ae401c0f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
"Share": "Partager",
"Add": "Ajouter",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
index df40d4351d..e4722aa0d2 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
index 8f9832b549..18af85e5db 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\u05d4\u05d5\u05e1\u05e3",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
index 63a832f1bc..748f2f6c11 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Specijal - {0}",
"Share": "Dijeli",
"Add": "Dodaj",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
index b5484668c1..dca2ce0e9c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Megoszt\u00e1s",
"Add": "Hozz\u00e1ad",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
index 875d5b7268..88e07bace5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
index 951fc95b8e..73482532b0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Aggiungi",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
index c3c0eb54ab..a5ed6fa2ae 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
@@ -3,9 +3,10 @@
"ChannelNumber": "\u0410\u0440\u043d\u0430 \u043d\u04e9\u043c\u0456\u0440\u0456",
"RecentlyWatched": "\u0416\u0443\u044b\u049b\u0442\u0430 \u049b\u0430\u0440\u0430\u043b\u0493\u0430\u043d",
"PlaceFavoriteChannelsAtBeginning": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0435\u04a3 \u0431\u0430\u0441\u044b\u043d\u0430\u043d \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
- "SeriesCancelled": "Series cancelled.",
- "HeaderKeepSeries": "Keep Series",
- "HeaderCancelSeries": "Cancel Series",
+ "SeriesCancelled": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0434\u044b.",
+ "HeaderKeepSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043d\u044b \u04b1\u0441\u0442\u0430\u043f \u0442\u04b1\u0440\u0443",
+ "HeaderCancelSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043d\u044b \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0443",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
"Share": "\u041e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443",
"Add": "\u04ae\u0441\u0442\u0435\u0443",
@@ -286,7 +287,7 @@
"RepeatEpisodes": "\u0411\u04e9\u043b\u0456\u043c\u0434\u0435\u0440\u0434\u0456\u04a3 \u049b\u0430\u0439\u0442\u0430\u043b\u0430\u043d\u0443\u044b",
"DvrSubscriptionRequired": "Emby DVR \u04af\u0448\u0456\u043d \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 Emby Premiere \u0436\u0430\u0437\u044b\u043b\u044b\u043c\u044b \u049b\u0430\u0436\u0435\u0442",
"HeaderCancelRecording": "\u0416\u0430\u0437\u0431\u0430\u043d\u044b \u0431\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
- "HeaderKeepRecording": "\u0416\u0430\u0437\u0443\u0434\u044b \u0436\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443",
+ "HeaderKeepRecording": "\u0416\u0430\u0437\u0443\u0434\u044b \u04b1\u0441\u0442\u0430\u043f \u0442\u04b1\u0440\u0443",
"HeaderLearnMore": "\u041a\u04e9\u0431\u0456\u0440\u0435\u043a \u0431\u0456\u043b\u0443",
"DeleteMedia": "\u0422\u0430\u0441\u044b\u0493\u044b\u0448\u0434\u0435\u0440\u0435\u043a\u0442\u0456 \u0436\u043e\u044e",
"SeriesSettings": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
index 7f0b80739c..b5e2a8b87c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\ucd94\uac00",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
index 437091be20..405ff2ba5e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
index cdf96e7e85..e4d8e18e26 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Spesial - {0}",
"Share": "Del",
"Add": "Legg til",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
index 4110206bc5..d2b1b32407 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Speciaal - {0}",
"Share": "Delen",
"Add": "Toevoegen",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
index 4ecf1589af..cbed3c1a9a 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Dodaj",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
index 854f8d76db..c9c0e2ff09 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "S\u00e9rie cancelada.",
"HeaderKeepSeries": "Manter S\u00e9rie",
"HeaderCancelSeries": "Cancelar S\u00e9rie",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Compartilhar",
"Add": "Adicionar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
index 188195049f..5d6945210e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Partilhar",
"Add": "Adicionar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
index 123249b7b4..b3ef274e8f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
index 3eaf3b8d07..e2e09dfd92 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
@@ -3,9 +3,10 @@
"ChannelNumber": "\u041d\u043e\u043c\u0435\u0440 \u043a\u0430\u043d\u0430\u043b\u0430",
"RecentlyWatched": "\u041d\u0435\u0434\u0430\u0432\u043d\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u043d\u043d\u043e\u0435",
"PlaceFavoriteChannelsAtBeginning": "\u0420\u0430\u0437\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0438\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0432 \u043d\u0430\u0447\u0430\u043b\u0435",
- "SeriesCancelled": "Series cancelled.",
- "HeaderKeepSeries": "Keep Series",
- "HeaderCancelSeries": "Cancel Series",
+ "SeriesCancelled": "\u0421\u0435\u0440\u0438\u0430\u043b \u043e\u0442\u043c\u0435\u043d\u0451\u043d.",
+ "HeaderKeepSeries": "\u0421\u0431\u0435\u0440\u0435\u0447\u044c \u0441\u0435\u0440\u0438\u0430\u043b",
+ "HeaderCancelSeries": "\u041e\u0442\u043c\u0435\u043d\u0430 \u0441\u0435\u0440\u0438\u0430\u043b\u0430",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
"Share": "\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f",
"Add": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
index 437091be20..405ff2ba5e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
index edffb0d5a7..9347dbe75c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
index 26c00e87ac..ccc6bd735f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Specialavsnitt - {0}",
"Share": "Dela",
"Add": "L\u00e4gg till",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
index e16959548b..9ad8585101 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Ekle",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
index 59494ecc2b..a94df08124 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
index 13f634113b..a405336526 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "Th\u00eam",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
index b077179208..6a77b89a54 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\u6dfb\u52a0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
index de6822529c..7de0656905 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share",
"Add": "\u65b0\u589e",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
index 78d0d1f02c..7aa41c9a22 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
@@ -6,6 +6,7 @@
"SeriesCancelled": "Series cancelled.",
"HeaderKeepSeries": "Keep Series",
"HeaderCancelSeries": "Cancel Series",
+ "CancelRecording": "Cancel recording",
"ValueSpecialEpisodeName": "Special - {0}",
"Share": "\u5206\u4eab",
"Add": "\u6dfb\u52a0",
diff --git a/dashboard-ui/components/navdrawer/navdrawer.css b/dashboard-ui/components/navdrawer/navdrawer.css
index 56543a4b67..36d028db1c 100644
--- a/dashboard-ui/components/navdrawer/navdrawer.css
+++ b/dashboard-ui/components/navdrawer/navdrawer.css
@@ -1,5 +1,5 @@
.touch-menu-la {
- width: 280px;
+ width: 260px;
position: fixed;
top: 0;
bottom: 0;
diff --git a/dashboard-ui/components/navdrawer/navdrawer.js b/dashboard-ui/components/navdrawer/navdrawer.js
index 54fc6136a9..273ace272e 100644
--- a/dashboard-ui/components/navdrawer/navdrawer.js
+++ b/dashboard-ui/components/navdrawer/navdrawer.js
@@ -24,7 +24,7 @@
self = this;
defaults = {
- width: 280,
+ width: 260,
handleSize: 30,
disableMask: false,
maxMaskOpacity: 0.5
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index b47bdfa41b..c149838cba 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -858,11 +858,13 @@
renderUrls: function (page, systemInfo) {
+ var helpButton = '' + Globalize.translate('ButtonHelp') + '';
+
if (systemInfo.LocalAddress) {
var localAccessHtml = Globalize.translate('LabelLocalAccessUrl', '' + systemInfo.LocalAddress + '');
- $('.localUrl', page).html(localAccessHtml).show().trigger('create');
+ $('.localUrl', page).html(localAccessHtml + helpButton).show().trigger('create');
} else {
$('.externalUrl', page).hide();
}
@@ -873,7 +875,7 @@
var remoteAccessHtml = Globalize.translate('LabelRemoteAccessUrl', '' + externalUrl + '');
- $('.externalUrl', page).html(remoteAccessHtml).show().trigger('create');
+ $('.externalUrl', page).html(remoteAccessHtml + helpButton).show().trigger('create');
} else {
$('.externalUrl', page).hide();
}
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index a3f0fae2b8..303a424f00 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -984,7 +984,7 @@
// At least 240
drawerWidth = Math.max(drawerWidth, 240);
// But not exceeding 280
- drawerWidth = Math.min(drawerWidth, 280);
+ drawerWidth = Math.min(drawerWidth, 260);
var disableEdgeSwipe = false;
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.css
index bd446f4dd6..c034aaa5ec 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.css
@@ -10,13 +10,11 @@
min-height: 100%;
position: absolute;
border: 0;
+ background: #fff;
}
-.ui-popup.ui-body-a {
- background: #f4f4f4;
-}
-.ui-popup.ui-body-b {
- background: #222;
+.ui-popup {
+ background: #fff;
}
.ui-popup-open .ui-header-fixed,
.ui-popup-open .ui-footer-fixed {