From 78ff953f37dac011bf5ee5ad52453751e90b8608 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 13 Oct 2015 22:41:46 -0400 Subject: [PATCH] update media info db --- .../components/directorybrowser/directorybrowser.js | 8 ++++++++ dashboard-ui/css/site.css | 6 ++++++ dashboard-ui/strings/javascript/javascript.json | 1 + dashboard-ui/themes/halloween/style.css | 4 ++-- dashboard-ui/themes/halloween/theme.js | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js index c4c51fbef..0bf788351 100644 --- a/dashboard-ui/components/directorybrowser/directorybrowser.js +++ b/dashboard-ui/components/directorybrowser/directorybrowser.js @@ -128,6 +128,14 @@ html += '
'; html += '' + Globalize.translate('ButtonMoreInformation') + ''; } + else if (systemInfo.OperatingSystem.toLowerCase() == 'linux') { + + html += '
'; + html += '
'; + html += Globalize.translate('MessageDirectoryPickerLinuxInstruction'); + html += '
'; + html += '' + Globalize.translate('ButtonMoreInformation') + ''; + } html += '

'; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 32fe6fe22..0d6b4e42e 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -533,6 +533,12 @@ a[data-role='button'], button:not([data-role='none']):not(.clearButton) { box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(0,0,0,.15) /*{global-box-shadow-color}*/; } + a[data-role='button'][data-iconpos='notext'], button[data-iconpos='notext']:not([data-role='none']):not(.clearButton) { + padding: 4px; + border-radius: 50px; + outline: 0; + } + a[data-role='button']:not([data-inline='true']), button:not([data-role='none']):not([data-inline='true']):not(.clearButton) { display: block; margin: .5em 0 !important; diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json index a3400d264..ed7ddb691 100644 --- a/dashboard-ui/strings/javascript/javascript.json +++ b/dashboard-ui/strings/javascript/javascript.json @@ -299,6 +299,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.", "HeaderMenu": "Menu", "ButtonOpen": "Open", "ButtonOpenInNewTab": "Open in new tab", diff --git a/dashboard-ui/themes/halloween/style.css b/dashboard-ui/themes/halloween/style.css index e498bb072..a4b522850 100644 --- a/dashboard-ui/themes/halloween/style.css +++ b/dashboard-ui/themes/halloween/style.css @@ -20,9 +20,9 @@ paper-button[raised].more { } .channelTimeslotHeader, .timeslotHeader { - background: #FF9100; + background: #FF9100 !important; } .channelTimeslotHeader { - border-right-color: #FF9100; + border-right-color: #FF9100 !important; } diff --git a/dashboard-ui/themes/halloween/theme.js b/dashboard-ui/themes/halloween/theme.js index 2f6c15882..83107c091 100644 --- a/dashboard-ui/themes/halloween/theme.js +++ b/dashboard-ui/themes/halloween/theme.js @@ -6,7 +6,7 @@ function onPageShow() { var page = this; - if (!$.browser.mobile) { + if (!$.browser.mobile && !page.classList.contains('itemDetailPage')) { Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg'); } }