diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index 9784e3a3b7..f0167baf13 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-icon", + "homepage": "https://github.com/polymerelements/iron-icon", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "f36b38928849ef3853db727faa8c9ef104d611eb" }, - "_source": "git://github.com/PolymerElements/iron-icon.git", + "_source": "git://github.com/polymerelements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-icon" + "_originalSource": "polymerelements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index fedc85052e..11e925acef 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.2.4", "commit": "1ee4e2e11a9e5118320987d93fc2c03ae9a489f4" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js index e3c2014e4b..d17ad7a88d 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.js +++ b/dashboard-ui/components/guestinviter/guestinviter.js @@ -1,4 +1,4 @@ -define(['paperdialoghelper', 'paper-input', 'paper-button', 'jqmcollapsible', 'paper-checkbox'], function (paperDialogHelper) { +define(['paperdialoghelper', 'paper-input', 'paper-button', 'emby-collapsible', 'paper-checkbox'], function (paperDialogHelper) { function renderLibrarySharingList(context, result) { @@ -110,8 +110,6 @@ dlg.innerHTML = html; document.body.appendChild(dlg); - // needed for the collapsible - $(dlg.querySelector('form')).trigger('create'); paperDialogHelper.open(dlg); diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html index 020a1bd408..761802f019 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.template.html +++ b/dashboard-ui/components/guestinviter/guestinviter.template.html @@ -15,14 +15,11 @@
-
-

${HeaderShareMediaFolders}

-
-
+ +
-
-
+

${MessageGuestSharingPermissionsHelp}


'; } - var elem = $('.subtitleList', page).html(html).trigger('create'); + var elem = $('.subtitleList', page).html(html); $('.btnViewSubtitles', elem).on('click', function () { @@ -267,7 +267,7 @@ html += ''; } - var elem = $('.subtitleResults', page).html(html).trigger('create'); + var elem = $('.subtitleResults', page).html(html); $('.btnViewSubtitle', elem).on('click', function () { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 8513cc97e5..740cfb238b 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -17,7 +17,7 @@ } .background-theme-b, paper-dialog.background-theme-b { - background-color: #1A1A1A; + background-color: #212121; /*background: radial-gradient(circle, #282828, #141414);*/ } @@ -55,15 +55,16 @@ padding-bottom: 0; } -.libraryPage > .ui-content { +.pageWithAbsoluteTabs .pageTabContent, .libraryPage > .ui-content { padding-top: 10px; } -.pageWithAbsoluteTabs .pageTabContent { - padding-top: 10px; -} +/*.pageWithAbsoluteTabs .pageTabContent { + padding-left: .5em !important; + padding-right: .5em !important; +}*/ -@media all and (max-width: 1200px) { +@media all and (max-width: 600px) { .libraryPage > .ui-content { padding-left: .5em !important; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index e9398f4c18..fbb9be995e 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -61,8 +61,9 @@ overflow-x: hidden; } -.dragging .mainDrawerPanel #drawer { -} +/*.mainDrawerPanel #drawer, .mainDrawerPanel #scrim { + top: 50px !important; +}*/ .mainDrawerPanel #main { left: 0 !important; @@ -74,7 +75,7 @@ /* Give it at least something to make it visible */ z-index: 1098; /* It defaults to absolute, not visible after scrolling */ - position: fixed; + position: fixed!important; } .mainDrawer { @@ -200,7 +201,7 @@ } .viewMenuBar, .libraryViewNav { - background-color: #080808; + background-color: #111; } .viewMenuBar.semiTransparent { @@ -397,8 +398,7 @@ body:not(.dashboardDocument) .btnNotifications { } .darkDrawer { - background-color: rgba(30,30,30,1) !important; - backdrop-filter: brightness(1.5) blur(4px); + background-color: #212121 !important; box-shadow: none !important; } @@ -420,9 +420,9 @@ body:not(.dashboardDocument) .btnNotifications { } .darkDrawer .sidebarLink:hover { - background: #444; + background: #4d4d4d; } .darkDrawer .sidebarLink.selectedSidebarLink, .darkDrawer .selectedMediaFolder { - background: #444 !important; + background: #4d4d4d !important; } diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js index 9740873c04..0ae31de4a5 100644 --- a/dashboard-ui/scripts/autoorganizesmart.js +++ b/dashboard-ui/scripts/autoorganizesmart.js @@ -93,7 +93,7 @@ html += ""; } - $('.divMatchInfos', page).html(html).trigger('create'); + $('.divMatchInfos', page).html(html); } function onApiFailure(e) { diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 85c8b4667d..cbeb62a7be 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -171,7 +171,7 @@ html = html.join('') + pagingHtml; - var elem = $('.latestNewsItems', page).html(html).trigger('create'); + var elem = $('.latestNewsItems', page).html(html); $('.btnNextPage', elem).on('click', function () { DashboardPage.newsStartIndex += query.Limit; @@ -769,7 +769,7 @@ } - $('#divRunningTasks', page).html(html).trigger('create'); + $('#divRunningTasks', page).html(html); }, renderUrls: function (page, systemInfo) { @@ -912,7 +912,7 @@ html += ''; } - elem.html(html).trigger('create'); + elem.html(html); }); }, @@ -1060,7 +1060,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb }); } - $(elem).html(html).trigger('create'); + $(elem).html(html); $('.btnNextPage', elem).on('click', function () { reloadData(elem, startIndex + limit, limit); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 714508965b..060db4141b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,4 +1,4 @@ -(function (window, document, $, devicePixelRatio) { +define(['imageLoader', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader) { function renderHeader() { @@ -48,9 +48,7 @@ document.body.appendChild(viewMenuBar); - require(['imageLoader'], function (imageLoader) { - imageLoader.lazyChildren(document.querySelector('.viewMenuBar')); - }); + imageLoader.lazyChildren(document.querySelector('.viewMenuBar')); document.dispatchEvent(new CustomEvent("headercreated", {})); bindMenuEvents(); @@ -81,7 +79,7 @@ var url = user.imageUrl; if (user.supportsImageParams) { - url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2)); + url += "&height=" + (userButtonHeight * Math.max(window.devicePixelRatio || 1, 2)); } if (headerUserButton) { @@ -168,7 +166,7 @@ var mainDrawerButton = document.querySelector('.mainDrawerButton'); if (mainDrawerButton) { - mainDrawerButton.addEventListener('click', openMainDrawer); + mainDrawerButton.addEventListener('click', toggleMainDrawer); } var headerBackButton = document.querySelector('.headerBackButton'); @@ -199,9 +197,19 @@ var requiresUserRefresh = true; var lastOpenTime = new Date().getTime(); - function openMainDrawer() { + function toggleMainDrawer() { var drawerPanel = document.querySelector('.mainDrawerPanel'); + if (drawerPanel.selected == 'drawer') { + closeMainDrawer(drawerPanel); + } else { + openMainDrawer(drawerPanel); + } + } + + function openMainDrawer(drawerPanel) { + + drawerPanel = drawerPanel || document.querySelector('.mainDrawerPanel'); drawerPanel.openDrawer(); lastOpenTime = new Date().getTime(); } @@ -244,9 +252,10 @@ document.querySelector('.mainDrawerPanel #drawer').classList.add('verticalScrollingDrawer'); } - function closeMainDrawer() { + function closeMainDrawer(drawerPanel) { - document.querySelector('.mainDrawerPanel').closeDrawer(); + drawerPanel = drawerPanel || document.querySelector('.mainDrawerPanel'); + drawerPanel.closeDrawer(); } function onMainDrawerSelect(e) { @@ -590,7 +599,7 @@ }, onHardwareMenuButtonClick: function () { - openMainDrawer(); + toggleMainDrawer(); }, onSettingsClicked: function (event) { @@ -943,7 +952,7 @@ setDrawerClass(); -})(window, document, jQuery, window.devicePixelRatio); +}); (function () { diff --git a/dashboard-ui/scripts/livetvguideprovider.js b/dashboard-ui/scripts/livetvguideprovider.js index 26710ab12d..2ac429815a 100644 --- a/dashboard-ui/scripts/livetvguideprovider.js +++ b/dashboard-ui/scripts/livetvguideprovider.js @@ -23,7 +23,6 @@ var html = this.response; var elem = page.querySelector('.providerTemplate'); elem.innerHTML = Globalize.translateDocument(html); - $(elem).trigger('create'); init(page, type, providerId); } diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index d85f514f23..f7a2ec3bc1 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -160,7 +160,7 @@ $('.servicesSection', page).hide(); } - $('.servicesList', page).html(servicesToDisplay.map(getServiceHtml).join('')).trigger('create'); + $('.servicesList', page).html(servicesToDisplay.map(getServiceHtml).join('')); var tuners = []; for (var i = 0, length = liveTvInfo.Services.length; i < length; i++) { diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index a342eb62bd..1e33bd018a 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -55,7 +55,7 @@ html += ''; - $('.serverLogs', page).html(html).trigger('create'); + $('.serverLogs', page).html(html); Dashboard.hideLoadingMsg(); }); diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js index f3bfbcc65f..eb199df59b 100644 --- a/dashboard-ui/scripts/metadatasubtitles.js +++ b/dashboard-ui/scripts/metadatasubtitles.js @@ -27,7 +27,7 @@ html += '' + culture.DisplayName + ''; } - $('.downloadLanguages', page).html(html).trigger('create'); + $('.downloadLanguages', page).html(html); var langs = config.DownloadLanguages || []; diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js index aea3c158cf..d66897a6b8 100644 --- a/dashboard-ui/scripts/pluginspage.js +++ b/dashboard-ui/scripts/pluginspage.js @@ -146,10 +146,10 @@ html += ''; } - $('.installedPlugins', page).html(html).trigger('create'); + $('.installedPlugins', page).html(html); } else { - var elem = $('.installedPlugins', page).html(html).trigger('create'); + var elem = $('.installedPlugins', page).html(html); $('.noConfigPluginCard', elem).on('click', function () { showNoConfigurationMessage(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 0feb563c5d..ba9e9c679a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1846,7 +1846,9 @@ var AppInfo = {}; define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]); - define('jqm', ['thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js']); + define('jqm', ['thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js'], function() { + $.mobile.filterHtml = Dashboard.filterHtml; + }); define("jqmbase", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']); define("jqmicons", ['jqmbase', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']); define("jqmtable", ['jqmbase', "thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']); @@ -2039,10 +2041,6 @@ var AppInfo = {}; var deps = []; deps.push('events'); - if (!window.fetch) { - deps.push('fetch'); - } - deps.push('scripts/mediacontroller'); deps.push('paper-drawer-panel'); @@ -2090,6 +2088,10 @@ var AppInfo = {}; deps.push('scripts/extensions'); + if (!window.fetch) { + deps.push('fetch'); + } + require(deps, function (connectionManagerExports, credentialProviderFactory) { window.MediaBrowser = window.MediaBrowser || {}; @@ -2099,9 +2101,6 @@ var AppInfo = {}; var promises = []; deps = []; - deps.push('emby-icons'); - deps.push('paper-icon-button'); - deps.push('paper-button'); deps.push('jQuery'); promises.push(getRequirePromise(deps)); @@ -2247,8 +2246,6 @@ var AppInfo = {}; imageLoader.enableFade = browserInfo.animate && !browserInfo.mobile; window.ImageLoader = imageLoader; - $.mobile.filterHtml = Dashboard.filterHtml; - $.mobile.initializePage(); var postInitDependencies = []; @@ -2422,9 +2419,7 @@ var AppInfo = {}; setAppInfo(); setDocumentClasses(); - getHostingAppInfo().then(function (hostingAppInfo) { - init(hostingAppInfo); - }); + getHostingAppInfo().then(init); }); } diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js index 9db2902f30..61eadcb999 100644 --- a/dashboard-ui/scripts/userprofilespage.js +++ b/dashboard-ui/scripts/userprofilespage.js @@ -172,7 +172,7 @@ var html = getUserSectionHtml(users, addConnectIndicator); - elem.html(html).trigger('create'); + elem.html(html); $('.btnUserMenu', elem).on('click', function () { showUserMenu(this); @@ -284,7 +284,7 @@ var html = users.map(getPendingUserHtml).join(''); - var elem = $('.pending', page).html(html).trigger('create'); + var elem = $('.pending', page).html(html); $('.btnUserMenu', elem).on('click', function () { showPendingUserMenu(this); diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index a64221f0f1..66237c8074 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -164,7 +164,6 @@ "LabelSelectUsers": "Select users:", "ButtonUpload": "Upload", "HeaderUploadNewImage": "Upload New Image", - "LabelDropImageHere": "Drop Image Here", "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.", "MessageNothingHere": "Nothing here.", "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.", @@ -199,8 +198,6 @@ "TabAlbumArtists": "Album Artists", "TabMusicVideos": "Music Videos", "ButtonSort": "Sort", - "HeaderSortBy": "Sort By:", - "HeaderSortOrder": "Sort Order:", "OptionPlayed": "Played", "OptionUnplayed": "Unplayed", "OptionAscending": "Ascending", @@ -375,8 +372,6 @@ "ButtonAutoScroll": "Auto-scroll", "LabelImageSavingConvention": "Image saving convention:", "LabelImageSavingConventionHelp": "Emby recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.", - "OptionImageSavingCompatible": "Compatible - Emby/Kodi/Plex", - "OptionImageSavingStandard": "Standard - MB2", "ButtonSignIn": "Sign In", "TitleSignIn": "Sign In", "HeaderPleaseSignIn": "Please sign in", @@ -394,7 +389,6 @@ "TabFavorites": "Favorites", "TabMyLibrary": "My Library", "ButtonCancelRecording": "Cancel Recording", - "HeaderPrePostPadding": "Pre/Post Padding", "LabelPrePaddingMinutes": "Pre-padding minutes:", "OptionPrePaddingRequired": "Pre-padding is required in order to record.", "LabelPostPaddingMinutes": "Post-padding minutes:", @@ -422,7 +416,6 @@ "ButtonRemove": "Remove", "OptionRecordSeries": "Record Series", "HeaderDetails": "Details", - "ButtonCancelRecording": "Cancel Recording", "TitleLiveTV": "Live TV", "LabelNumberOfGuideDays": "Number of days of guide data to download:", "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.", @@ -516,7 +509,6 @@ "OptionMaxQualityTranscoding": "Max quality", "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.", - "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.", "HeaderAddTitles": "Add Titles", "LabelEnableDlnaPlayTo": "Enable DLNA Play To", @@ -670,11 +662,6 @@ "TitleDlna": "DLNA", "TitleChannels": "Channels", "HeaderServerSettings": "Server Settings", - "LabelWeatherDisplayLocation": "Weather display location:", - "LabelWeatherDisplayLocationHelp": "US zip code / City, State, Country / City, Country", - "LabelWeatherDisplayUnit": "Weather display unit:", - "OptionCelsius": "Celsius", - "OptionFahrenheit": "Fahrenheit", "HeaderRequireManualLogin": "Require manual username entry for:", "HeaderRequireManualLoginHelp": "When disabled clients may present a login screen with a visual selection of users.", "OptionOtherApps": "Other apps", @@ -766,9 +753,7 @@ "HeaderDirectPlayProfile": "Direct Play Profile", "HeaderTranscodingProfile": "Transcoding Profile", "HeaderCodecProfile": "Codec Profile", - "HeaderCodecProfileHelp": "Define additional conditions that must be met in order for a codec to be direct played.", "HeaderContainerProfile": "Container Profile", - "HeaderContainerProfileHelp": "Define additional conditions that must be met in order for a file to be direct played.", "OptionProfileVideo": "Video", "OptionProfileAudio": "Audio", "OptionProfileVideoAudio": "Video Audio", @@ -1076,7 +1061,6 @@ "LabelImageType": "Image type:", "OptionPrimary": "Primary", "OptionArt": "Art", - "OptionBackdrop": "Backdrop", "OptionBox": "Box", "OptionBoxRear": "Box rear", "OptionDisc": "Disc", @@ -1517,7 +1501,6 @@ "HeaderCameraUpload": "Camera Upload", "SelectCameraUploadServers": "Upload camera photos to the following servers:", "ButtonClear": "Clear", - "ButtonEditImages": "Edit Images", "LabelFolder": "Folder:", "HeadersFolders": "Folders", "LabelDisplayName": "Display name:", @@ -1555,9 +1538,6 @@ "HeaderPinCodeReset": "Reset Pin Code", "PasswordSaved": "Password saved.", "PasswordMatchError": "Password and password confirmation must match.", - "OptionRelease": "Official Release", - "OptionBeta": "Beta", - "OptionDev": "Dev (Unstable)", "UninstallPluginHeader": "Uninstall Plugin", "UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?", "NoPluginConfigurationMessage": "This plugin has nothing to configure.", @@ -1572,7 +1552,6 @@ "HeaderConfirmation": "Confirmation", "MessageKeyUpdated": "Thank you. Your Emby Premiere key has been updated.", "MessageKeyRemoved": "Thank you. Your Emby Premiere key has been removed.", - "HeaderSupportTheTeam": "Support the Emby Team", "TextEnjoyBonusFeatures": "Enjoy Bonus Features", "TitleLiveTV": "Live TV", "ButtonCancelSyncJob": "Cancel sync", @@ -1725,14 +1704,6 @@ "MessageRecordingDeleted": "Recording deleted.", "ButonCancelRecording": "Cancel Recording", "MessageRecordingSaved": "Recording saved.", - "OptionSunday": "Sunday", - "OptionMonday": "Monday", - "OptionTuesday": "Tuesday", - "OptionWednesday": "Wednesday", - "OptionThursday": "Thursday", - "OptionFriday": "Friday", - "OptionSaturday": "Saturday", - "OptionEveryday": "Every day", "OptionWeekend": "Weekends", "OptionWeekday": "Weekdays", "HeaderConfirmDeletion": "Confirm Deletion", @@ -1840,7 +1811,7 @@ "ButtonNetwork": "Network", "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}.", "MessageDirectoryPickerBSDInstruction": "For BSD, you may need to configure storage within your FreeNAS Jail in order to allow Emby to access it.", - "MessageDirectoryPickerLinuxInstruction": "For Linux, you must grant the Emby system user at least read access to your storage locations.", + "MessageDirectoryPickerLinuxInstruction": "For Linux on Arch Linux, CentOS, Debian, Fedora, OpenSuse, or Ubuntu, you must grant the Emby system user at least read access to your storage locations.", "HeaderMenu": "Menu", "ButtonOpen": "Open", "ButtonOpenInNewTab": "Open in new tab", @@ -1946,7 +1917,6 @@ "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from Emby Server.", "ButtonHide": "Hide", "MessageSettingsSaved": "Settings saved.", - "ButtonSignOut": "Sign Out", "ButtonMyProfile": "My Profile", "ButtonMyPreferences": "My Preferences", "MessageBrowserDoesNotSupportWebSockets": "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.", @@ -2062,7 +2032,7 @@ "HeaderAddMediaFolder": "Add Media Folder", "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):", "HeaderRemoveMediaFolder": "Remove Media Folder", - "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:", + "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your Emby library:", "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?", "ButtonRename": "Rename", "ButtonChangeContentType": "Change content type", diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json index e6be6cd31d..66237c8074 100644 --- a/dashboard-ui/strings/server.json +++ b/dashboard-ui/strings/server.json @@ -164,7 +164,6 @@ "LabelSelectUsers": "Select users:", "ButtonUpload": "Upload", "HeaderUploadNewImage": "Upload New Image", - "LabelDropImageHere": "Drop Image Here", "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.", "MessageNothingHere": "Nothing here.", "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.", @@ -199,8 +198,6 @@ "TabAlbumArtists": "Album Artists", "TabMusicVideos": "Music Videos", "ButtonSort": "Sort", - "HeaderSortBy": "Sort By:", - "HeaderSortOrder": "Sort Order:", "OptionPlayed": "Played", "OptionUnplayed": "Unplayed", "OptionAscending": "Ascending", @@ -375,8 +372,6 @@ "ButtonAutoScroll": "Auto-scroll", "LabelImageSavingConvention": "Image saving convention:", "LabelImageSavingConventionHelp": "Emby recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.", - "OptionImageSavingCompatible": "Compatible - Emby/Kodi/Plex", - "OptionImageSavingStandard": "Standard - MB2", "ButtonSignIn": "Sign In", "TitleSignIn": "Sign In", "HeaderPleaseSignIn": "Please sign in", @@ -394,7 +389,6 @@ "TabFavorites": "Favorites", "TabMyLibrary": "My Library", "ButtonCancelRecording": "Cancel Recording", - "HeaderPrePostPadding": "Pre/Post Padding", "LabelPrePaddingMinutes": "Pre-padding minutes:", "OptionPrePaddingRequired": "Pre-padding is required in order to record.", "LabelPostPaddingMinutes": "Post-padding minutes:", @@ -422,7 +416,6 @@ "ButtonRemove": "Remove", "OptionRecordSeries": "Record Series", "HeaderDetails": "Details", - "ButtonCancelRecording": "Cancel Recording", "TitleLiveTV": "Live TV", "LabelNumberOfGuideDays": "Number of days of guide data to download:", "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.", @@ -516,7 +509,6 @@ "OptionMaxQualityTranscoding": "Max quality", "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.", - "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging", "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.", "HeaderAddTitles": "Add Titles", "LabelEnableDlnaPlayTo": "Enable DLNA Play To", @@ -670,11 +662,6 @@ "TitleDlna": "DLNA", "TitleChannels": "Channels", "HeaderServerSettings": "Server Settings", - "LabelWeatherDisplayLocation": "Weather display location:", - "LabelWeatherDisplayLocationHelp": "US zip code / City, State, Country / City, Country", - "LabelWeatherDisplayUnit": "Weather display unit:", - "OptionCelsius": "Celsius", - "OptionFahrenheit": "Fahrenheit", "HeaderRequireManualLogin": "Require manual username entry for:", "HeaderRequireManualLoginHelp": "When disabled clients may present a login screen with a visual selection of users.", "OptionOtherApps": "Other apps", @@ -766,9 +753,7 @@ "HeaderDirectPlayProfile": "Direct Play Profile", "HeaderTranscodingProfile": "Transcoding Profile", "HeaderCodecProfile": "Codec Profile", - "HeaderCodecProfileHelp": "Define additional conditions that must be met in order for a codec to be direct played.", "HeaderContainerProfile": "Container Profile", - "HeaderContainerProfileHelp": "Define additional conditions that must be met in order for a file to be direct played.", "OptionProfileVideo": "Video", "OptionProfileAudio": "Audio", "OptionProfileVideoAudio": "Video Audio", @@ -1076,7 +1061,6 @@ "LabelImageType": "Image type:", "OptionPrimary": "Primary", "OptionArt": "Art", - "OptionBackdrop": "Backdrop", "OptionBox": "Box", "OptionBoxRear": "Box rear", "OptionDisc": "Disc", @@ -1517,7 +1501,6 @@ "HeaderCameraUpload": "Camera Upload", "SelectCameraUploadServers": "Upload camera photos to the following servers:", "ButtonClear": "Clear", - "ButtonEditImages": "Edit Images", "LabelFolder": "Folder:", "HeadersFolders": "Folders", "LabelDisplayName": "Display name:", @@ -1555,9 +1538,6 @@ "HeaderPinCodeReset": "Reset Pin Code", "PasswordSaved": "Password saved.", "PasswordMatchError": "Password and password confirmation must match.", - "OptionRelease": "Official Release", - "OptionBeta": "Beta", - "OptionDev": "Dev (Unstable)", "UninstallPluginHeader": "Uninstall Plugin", "UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?", "NoPluginConfigurationMessage": "This plugin has nothing to configure.", @@ -1572,7 +1552,6 @@ "HeaderConfirmation": "Confirmation", "MessageKeyUpdated": "Thank you. Your Emby Premiere key has been updated.", "MessageKeyRemoved": "Thank you. Your Emby Premiere key has been removed.", - "HeaderSupportTheTeam": "Support the Emby Team", "TextEnjoyBonusFeatures": "Enjoy Bonus Features", "TitleLiveTV": "Live TV", "ButtonCancelSyncJob": "Cancel sync", @@ -1725,14 +1704,6 @@ "MessageRecordingDeleted": "Recording deleted.", "ButonCancelRecording": "Cancel Recording", "MessageRecordingSaved": "Recording saved.", - "OptionSunday": "Sunday", - "OptionMonday": "Monday", - "OptionTuesday": "Tuesday", - "OptionWednesday": "Wednesday", - "OptionThursday": "Thursday", - "OptionFriday": "Friday", - "OptionSaturday": "Saturday", - "OptionEveryday": "Every day", "OptionWeekend": "Weekends", "OptionWeekday": "Weekdays", "HeaderConfirmDeletion": "Confirm Deletion", @@ -1946,7 +1917,6 @@ "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from Emby Server.", "ButtonHide": "Hide", "MessageSettingsSaved": "Settings saved.", - "ButtonSignOut": "Sign Out", "ButtonMyProfile": "My Profile", "ButtonMyPreferences": "My Preferences", "MessageBrowserDoesNotSupportWebSockets": "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.", diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js index ae350e52c9..8345423df9 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js @@ -961,7 +961,14 @@ }; self._enhance(); - self.element.enhanceWithin(); + + var requireValues = pageElem.getAttribute('data-require'); + if (requireValues && requireValues.indexOf('jqm') != -1) { + self.element.enhanceWithin(); + } + else if ((pageElem.getAttribute('data-url') || '').toLowerCase().indexOf('/configurationpage?') != -1) { + self.element.enhanceWithin(); + } pageElem.dispatchEvent(new CustomEvent("pageinit", { bubbles: true diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 6457053b9e..144a702b78 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -484,7 +484,7 @@ paper-textarea.mono textarea { } .ui-body-b .paperList { - background-color: #2b2b2b; + background-color: #323232; } paper-dropdown-menu {