From faeb1c6d227b7872cf837096bca8e2e681935d68 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 30 Sep 2016 02:50:06 -0400 Subject: [PATCH] add new guide settings --- .../emby-webcomponents/.bower.json | 8 ++-- .../emby-webcomponents/cardbuilder/card.css | 13 +++++- .../emby-radio/emby-radio.css | 8 ++-- .../guide/guide-settings.js | 41 +++++++++++++++++-- .../guide/guide-settings.template.html | 22 ++++++---- .../emby-webcomponents/guide/guide.js | 10 ++++- .../emby-webcomponents/strings/en-US.json | 6 ++- 7 files changed, 87 insertions(+), 21 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 8c38d59a92..4384ce6124 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.275", - "_release": "1.4.275", + "version": "1.4.277", + "_release": "1.4.277", "_resolution": { "type": "version", - "tag": "1.4.275", - "commit": "0cf87e2fcb9f535b73ecdba2d961ceb64e1c5e4f" + "tag": "1.4.277", + "commit": "721497f3b6225061614ee301e8b38a5eb5f34eb2" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index 64ca726879..2f596b3424 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -511,7 +511,6 @@ } } - @media all and (min-width: 1600px) { .portraitCard-scalable { @@ -521,6 +520,10 @@ .smallBackdropCard-scalable { width: 12.5%; } + + .backdropCard-scalable { + width: 20%; + } } @media all and (min-width: 1800px) { @@ -582,3 +585,11 @@ .layout-tv .personCard-scalable { width: 14.285714285714285714285714285714%; } + + +@media all and (min-width: 1600px) { + + .layout-tv .backdropCard-scalable { + width: 25%; + } +} diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css b/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css index 6285b089b5..f8023128f9 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css @@ -43,13 +43,13 @@ height: 16px; margin: 0; cursor: pointer; - border: 2px solid rgba(0,0,0, 0.54); + border: 2px solid currentcolor; border-radius: 50%; z-index: 2; } .mdl-radio__button:checked + .mdl-radio__label + .mdl-radio__outer-circle { - border: 2px solid rgb(63,81,181); + border: 2px solid rgb(82, 181, 75); } .mdl-radio__button:disabled + .mdl-radio__label + .mdl-radio__outer-circle { @@ -75,7 +75,7 @@ -webkit-transform: scale3d(0, 0, 0); transform: scale3d(0, 0, 0); border-radius: 50%; - background: rgb(63,81,181); + background: rgb(82, 181, 75); } .mdl-radio__button:checked + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle { @@ -89,7 +89,7 @@ } .mdl-radio__button:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle { - box-shadow: 0 0 0px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0px 10px rgba(82, 181, 75, 0.26); } .mdl-radio__label { diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js index 8782588556..aa91ae943d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js @@ -1,21 +1,34 @@ -define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectionManager', 'require', 'loading', 'scrollHelper', 'emby-checkbox', 'css!./../formdialog', 'material-icons'], function (dialogHelper, globalize, userSettings, layoutManager, connectionManager, require, loading, scrollHelper) { +define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectionManager', 'require', 'loading', 'scrollHelper', 'emby-checkbox', 'emby-radio', 'css!./../formdialog', 'material-icons'], function (dialogHelper, globalize, userSettings, layoutManager, connectionManager, require, loading, scrollHelper) { function save(context) { + var i, length; + var chkIndicators = context.querySelectorAll('.chkIndicator'); - for (var i = 0, length = chkIndicators.length; i < length; i++) { + for (i = 0, length = chkIndicators.length; i < length; i++) { var type = chkIndicators[i].getAttribute('data-type'); userSettings.set('guide-indicator-' + type, chkIndicators[i].checked); } userSettings.set('guide-colorcodedbackgrounds', context.querySelector('.chkColorCodedBackgrounds').checked); + userSettings.set('livetv-favoritechannelsattop', context.querySelector('.chkFavoriteChannelsAtTop').checked); + + var sortBys = context.querySelectorAll('.chkSortOrder'); + for (i = 0, length = sortBys.length; i < length; i++) { + if (sortBys[i].checked) { + userSettings.set('livetv-channelorder', sortBys[i].value); + break; + } + } } function load(context) { + var i, length; + var chkIndicators = context.querySelectorAll('.chkIndicator'); - for (var i = 0, length = chkIndicators.length; i < length; i++) { + for (i = 0, length = chkIndicators.length; i < length; i++) { var type = chkIndicators[i].getAttribute('data-type'); @@ -27,6 +40,28 @@ } context.querySelector('.chkColorCodedBackgrounds').checked = userSettings.get('guide-colorcodedbackgrounds') == 'true'; + context.querySelector('.chkFavoriteChannelsAtTop').checked = userSettings.get('livetv-favoritechannelsattop') != 'false'; + + var sortByValue = userSettings.get('livetv-channelorder') || 'DatePlayed'; + + var sortBys = context.querySelectorAll('.chkSortOrder'); + for (i = 0, length = sortBys.length; i < length; i++) { + sortBys[i].checked = sortBys[i].value == sortByValue; + } + } + + function onSortByChange() { + var newValue = this.value; + if (this.checked) { + var changed = options.query.SortBy != newValue; + + options.query.SortBy = newValue.replace('_', ','); + options.query.StartIndex = 0; + + if (options.callback && changed) { + options.callback(); + } + } } function showEditor() { diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html index f2d7693507..2fd24e7857 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html @@ -7,31 +7,39 @@
+

${SortChannelsBy}

+ + +
+

${ShowIndicatorsFor}

-
-