';
@@ -1131,6 +1133,15 @@
removeFromCollection(page, parentItem, [itemId], user, context);
});
+
+ collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
+ require(['alert'], function (alert) {
+ alert({
+ text: Globalize.translate('AddItemToCollectionHelp'),
+ html: Globalize.translate('AddItemToCollectionHelp') + '
' + Globalize.translate('ButtonLearnMore') + ''
+ });
+ });
+ });
}
function removeFromCollection(page, parentItem, itemIds, user, context) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index d7e2362d0a..2a5616e31a 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -213,14 +213,11 @@
if (selected == null) {
- var elem = tabs.querySelector('.pageTabButton.is-active');
- if (elem) {
- return parseInt(elem.getAttribute('data-index'));
- }
- return 0;
+ return tabs.selectedTabIndex || 0;
}
var current = LibraryBrowser.selectedTab(tabs);
+ tabs.selectedTabIndex = selected;
if (current == selected) {
tabs.dispatchEvent(new CustomEvent("tabchange", {
detail: {
@@ -268,13 +265,13 @@
LibraryBrowser.configureSwipeTabs(ownerpage, tabs);
}
- var buttons = tabs.querySelectorAll('.pageTabButton');
- for (var i = 0, length = buttons.length; i < length; i++) {
- //buttons[i].classList.add('mdl-button');
- //buttons[i].classList.add('mdl-js-button');
- var div = document.createElement('div');
- div.classList.add('pageTabButtonSelectionBar');
- buttons[i].appendChild(div);
+ if (!browserInfo.safari || !AppInfo.isNativeApp) {
+ var buttons = tabs.querySelectorAll('.pageTabButton');
+ for (var i = 0, length = buttons.length; i < length; i++) {
+ var div = document.createElement('div');
+ div.classList.add('pageTabButtonSelectionBar');
+ buttons[i].appendChild(div);
+ }
}
tabs.classList.add('hiddenScrollX');
@@ -1069,7 +1066,8 @@
}
if (item.CollectionType == 'games') {
- return 'gamesrecommended.html?topParentId=' + item.Id;
+ return id ? "itemlist.html?parentId=" + id : "#";
+ //return 'gamesrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'playlists') {
return 'playlists.html?topParentId=' + item.Id;
@@ -1787,20 +1785,20 @@
var isSquareAspectRatio = primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33 ||
primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01;
- if (options.shape == 'auto' || options.shape == 'autohome') {
+ if (options.shape == 'auto' || options.shape == 'autohome' || options.shape == 'autooverflow') {
if (isThumbAspectRatio) {
- options.shape = options.shape == 'auto' ? 'backdrop' : 'backdrop';
+ options.shape = options.shape == 'autooverflow' ? 'overflowBackdrop' : 'backdrop';
} else if (isSquareAspectRatio) {
options.coverImage = true;
- options.shape = 'square';
+ options.shape = options.shape == 'autooverflow' ? 'overflowSquare' : 'square';
} else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) {
options.shape = 'banner';
options.coverImage = true;
} else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) {
- options.shape = options.shape == 'auto' ? 'portrait' : 'portrait';
+ options.shape = options.shape == 'autooverflow' ? 'overflowPortrait' : 'portrait';
} else {
- options.shape = options.defaultShape || (options.shape == 'auto' ? 'square' : 'square');
+ options.shape = options.defaultShape || (options.shape == 'autooverflow' ? 'overflowSquare' : 'square');
}
}
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index bb83f29223..3fb2ff4bc6 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -743,7 +743,7 @@
var helpUrl = page.getAttribute('data-helpurl');
if (helpUrl) {
- html += '
Help';
+ html += '
' + Globalize.translate('ButtonHelp') + '';
}
}
}
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 9e16f38854..9758bf997e 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -54,10 +54,6 @@
Dashboard.hideLoadingMsg();
}
- function getSquareShape() {
- return enableScrollX() ? 'overflowSquare' : 'square';
- }
-
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
@@ -80,14 +76,12 @@
recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({
items: recordings,
- shape: (enableScrollX() ? getSquareShape() : 'auto'),
+ shape: (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true,
showParentTitle: true,
- centerText: true,
coverImage: true,
lazy: true,
- overlayPlayButton: true
-
+ cardLayout: true
});
ImageLoader.lazyChildren(recordingItems);
@@ -113,7 +107,7 @@
ApiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
- limit: 4,
+ limit: enableScrollX() ? 12 : 4,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio'
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index d0722c1390..ed952e3ba2 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -8,14 +8,6 @@
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
- function getThumbShape() {
- return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
- }
-
- function getSquareShape() {
- return enableScrollX() ? 'overflowSquare' : 'square';
- }
-
function getLimit() {
return enableScrollX() ? 12 : 8;
@@ -109,7 +101,7 @@
var html = libraryBrowser.getPosterViewHtml({
items: items,
- shape: shape || (enableScrollX() ? getSquareShape() : 'auto'),
+ shape: shape || (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true,
centerText: true,
coverImage: true,
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 2a9a40af5f..6d1ccab082 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -301,7 +301,7 @@
baseUrl += '?topParentId=' + topParentId;
}
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5]);
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 3, 4, 5]);
var tabControllers = [];
var renderedTabs = [];
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index a674d3dc0d..f3e80e6418 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2243,7 +2243,7 @@ var AppInfo = {};
var baseUrl = 'bower_components/emby-webcomponents/strings/';
- var languages = ['da', 'en-US', 'kk', 'nl', 'ru'];
+ var languages = ['da', 'en-US', 'es-MX', 'kk', 'nb', 'nl', 'ru'];
var translations = languages.map(function (i) {
return {
@@ -2404,9 +2404,10 @@ var AppInfo = {};
defineRoute({
path: '/dashboardhosting.html',
- dependencies: [],
+ dependencies: ['paper-checkbox', 'paper-input', 'paper-button'],
autoFocus: false,
- roles: 'admin'
+ roles: 'admin',
+ controller: 'scripts/dashboardhosting'
});
defineRoute({
@@ -2698,7 +2699,7 @@ var AppInfo = {};
defineRoute({
path: '/movies.html',
- dependencies: ['paper-checkbox', 'paper-fab', 'scripts/alphapicker', 'paper-button'],
+ dependencies: ['paper-checkbox', 'scripts/alphapicker', 'paper-button'],
autoFocus: false,
controller: 'scripts/moviesrecommended',
transition: 'fade'
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 4d08016d0f..308f7dbd00 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -561,8 +561,8 @@
"LabelWebSocketPortNumber": "Web socket port number:",
"LabelEnableAutomaticPortMap": "Enable automatic port mapping",
"LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.",
- "LabelExternalDDNS": "External WAN Address:",
- "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. Leave empty for automatic detection.",
+ "LabelExternalDDNS": "External domain:",
+ "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. This field is required when used with a custom https certificate.",
"TabResume": "Resume",
"TabWeather": "Weather",
"TitleAppSettings": "App Settings",
@@ -2351,5 +2351,7 @@
"LabelOriginalTitle": "Original title:",
"LabelSortTitle": "Sort title:",
"OptionConvertRecordingPreserveAudio": "Preserve original audio when converting recordings",
- "OptionConvertRecordingPreserveAudioHelp": "This will provide better audio but may require transcoding during playback on some devices."
+ "OptionConvertRecordingPreserveAudioHelp": "This will provide better audio but may require transcoding during playback on some devices.",
+ "CreateCollectionHelp": "Collections allow you to create personalized groupings of movies and other library content.",
+ "AddItemToCollectionHelp": "Add items to collections by searching for them and using their right-click or tap menus to add them to a collection."
}