update program queries

dashboard-ui/bower_components/emby-webcomponents/.bower.json

@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.292",
+  "version": "1.4.294",
-  "_release": "1.4.292",
+  "_release": "1.4.294",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.292",
+    "tag": "1.4.294",
-    "commit": "42bd91dd686bbe14a0126e620d0fececb757516b"
+    "commit": "261889a750a63f93e456622c6882d18bb9248626"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",

dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css

@@ -9,7 +9,7 @@
 }
 
 .actionsheet-not-fullscreen {
-    background-color: #262626;
+    background-color: #2a2a2a;
 }
 
 .actionSheetMenuItem:hover {

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%;
     }

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)();
             });
         });

dashboard-ui/bower_components/emby-webcomponents/itemhovermenu/itemhovermenu.js

@@ -246,7 +246,7 @@
         showOverlayTimeout = setTimeout(function () {
             onShowTimerExpired(card);
 
-        }, 1200);
+        }, 1400);
     }
 
     function preventTouchHover() {

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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.",
+    "SeriesCancelled": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0434\u044b.",
-    "HeaderKeepSeries": "Keep Series",
+    "HeaderKeepSeries": "\u0422\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043d\u044b \u04b1\u0441\u0442\u0430\u043f \u0442\u04b1\u0440\u0443",
-    "HeaderCancelSeries": "Cancel Series",
+    "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",

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",

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",

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",

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",

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",

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",

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",

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",

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.",
+    "SeriesCancelled": "\u0421\u0435\u0440\u0438\u0430\u043b \u043e\u0442\u043c\u0435\u043d\u0451\u043d.",
-    "HeaderKeepSeries": "Keep Series",
+    "HeaderKeepSeries": "\u0421\u0431\u0435\u0440\u0435\u0447\u044c \u0441\u0435\u0440\u0438\u0430\u043b",
-    "HeaderCancelSeries": "Cancel Series",
+    "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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

dashboard-ui/components/navdrawer/navdrawer.css

@@ -1,5 +1,5 @@
 .touch-menu-la {
-    width: 280px;
+    width: 260px;
     position: fixed;
     top: 0;
     bottom: 0;

dashboard-ui/components/navdrawer/navdrawer.js

@@ -24,7 +24,7 @@
             self = this;
 
             defaults = {
-                width: 280,
+                width: 260,
                 handleSize: 30,
                 disableMask: false,
                 maxMaskOpacity: 0.5

dashboard-ui/scripts/dashboardpage.js

@@ -858,11 +858,13 @@
 
         renderUrls: function (page, systemInfo) {
 
+            var helpButton = '<a href="https://github.com/MediaBrowser/Wiki/wiki/Connectivity" target="_blank" style="margin-left:1em;color:#fff;background:#52B54B;padding:.25em 1em;border-radius:.5em;">' + Globalize.translate('ButtonHelp') + '</a>';
+
             if (systemInfo.LocalAddress) {
 
                 var localAccessHtml = Globalize.translate('LabelLocalAccessUrl', '<a href="' + systemInfo.LocalAddress + '" target="_blank">' + systemInfo.LocalAddress + '</a>');
 
-                $('.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', '<a href="' + externalUrl + '" target="_blank">' + externalUrl + '</a>');
 
-                $('.externalUrl', page).html(remoteAccessHtml).show().trigger('create');
+                $('.externalUrl', page).html(remoteAccessHtml + helpButton).show().trigger('create');
             } else {
                 $('.externalUrl', page).hide();
             }

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;
 

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 {
+.ui-popup {
-    background: #f4f4f4;
+    background: #fff;
-}
-.ui-popup.ui-body-b {
-    background: #222;
 }
 .ui-popup-open .ui-header-fixed,
 .ui-popup-open .ui-footer-fixed {