From 4229e36361244a595256f68c1eec72c97de5f8ed Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 7 Sep 2016 22:55:54 -0400 Subject: [PATCH] limit transcoding to level 41 --- .../emby-webcomponents/.bower.json | 8 ++++---- .../actionsheet/actionsheet.css | 4 ++-- .../emby-webcomponents/cardbuilder/cardbuilder.js | 2 +- .../emby-webcomponents/guide/guide-settings.js | 2 +- .../emby-webcomponents/guide/guide.css | 6 ++++-- .../emby-webcomponents/listview/listview.js | 7 +++---- .../bower_components/iron-icon/.bower.json | 6 +++--- dashboard-ui/bower_components/polymer/.bower.json | 8 ++++---- .../guestinviter/guestinviter.template.html | 15 +++++++-------- .../libraryoptionseditor/libraryoptionseditor.js | 2 +- .../libraryoptionseditor.template.html | 2 +- dashboard-ui/home.html | 1 - dashboard-ui/movies.html | 2 -- dashboard-ui/thirdparty/paper-button-style.css | 3 ++- dashboard-ui/tv.html | 3 --- 15 files changed, 33 insertions(+), 38 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index f4dbf356e0..5359f26dd8 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.228", - "_release": "1.4.228", + "version": "1.4.229", + "_release": "1.4.229", "_resolution": { "type": "version", - "tag": "1.4.228", - "commit": "1cfdbd2cf131d65f407bb004f8840f8b0cb929ea" + "tag": "1.4.229", + "commit": "aaee0b2e654b9007116e9b4eb5b5b86dd39d323b" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css index 156ea446f7..d2ab1dd2f9 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css +++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css @@ -92,6 +92,6 @@ .btnCloseActionSheet { position: fixed; - top: .5em; - left: .25em; + top: .75em; + left: .5em; } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index cca34bcc09..e81b1a1dd6 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -851,7 +851,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (options.showCurrentProgram && item.Type == 'TvChannel') { if (item.CurrentProgram) { - lines.push(itemHelper.getDisplayName(item.CurrentProgram)); + lines.push(item.CurrentProgram.Name); } else { lines.push(''); } 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 81c8551758..2e57db8488 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js @@ -35,7 +35,7 @@ }; if (layoutManager.tv) { - dialogOptions.size = 'fullscreen'; + dialogOptions.size = 'medium'; } else { dialogOptions.size = 'small'; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index 3918b00a6d..8545913ce3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -46,10 +46,10 @@ .guideProgramIndicator { text-transform: uppercase; - border-radius: .3em; + border-radius: 2px; margin-right: .5em; color: #fff; - font-size: 82%; + font-size: 80%; padding: .2em .25em; display: inline-flex; align-items: center; @@ -367,6 +367,8 @@ padding: 0 .5em 0; overflow: hidden; text-overflow: ellipsis; + display: flex; + align-items: center; } .guideProgramTime { diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js index f3b8df600d..12ceb510a3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js +++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js @@ -257,10 +257,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan textlines.push(item.SeriesName || ' '); } - // Not needed, part of mediainfo - //if (item.EpisodeTitle) { - // textlines.push(item.Name || ' '); - //} + if (item.EpisodeTitle) { + textlines.push(item.Name || ' '); + } } var displayName = itemHelper.getDisplayName(item); diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index 87e3dad5d3..f76855b27a 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.10", "_resolution": { "type": "version", "tag": "v1.0.10", "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" }, - "_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/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 0a799864cb..25eb84c037 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -32,14 +32,14 @@ "iron-component-page": "polymerElements/iron-component-page#^1.1.6" }, "private": true, - "homepage": "https://github.com/Polymer/polymer", + "homepage": "https://github.com/polymer/polymer", "_release": "1.6.1", "_resolution": { "type": "version", "tag": "v1.6.1", "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" }, - "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.5.0", - "_originalSource": "Polymer/polymer" + "_source": "git://github.com/polymer/polymer.git", + "_target": "^1.1.0", + "_originalSource": "polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html index bc1ddd90d8..15d731361c 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.template.html +++ b/dashboard-ui/components/guestinviter/guestinviter.template.html @@ -25,14 +25,13 @@

${MessageGuestSharingPermissionsHelp}


- -
-
-
-
+ +
+ +
\ No newline at end of file diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js index a770b6a905..0c34e9452d 100644 --- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js +++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js @@ -28,7 +28,7 @@ function setContentType(parent, contentType) { if (contentType == 'music' || contentType == 'tvshows' || contentType == 'movies' || contentType == 'homevideos' || contentType == 'musicvideos' || contentType == 'mixed' || !contentType) { - parent.querySelector('.chkArhiveAsMediaContainer').classList.remove('hide'); + parent.querySelector('.chkArhiveAsMediaContainer').classList.add('hide'); } else { parent.querySelector('.chkArhiveAsMediaContainer').classList.add('hide'); } diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html index 1548fa1b30..4de83a3589 100644 --- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html +++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html @@ -30,7 +30,7 @@
${LabelExtractChaptersDuringLibraryScanHelp}
-
+