cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

limit transcoding to level 41

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-07 22:55:54 -04:00
parent 1eb2690523
commit 4229e36361
15 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -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",

4
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css vendored
View File

@ -92,6 +92,6 @@
.btnCloseActionSheet {
position: fixed;
top: .5em;
left: .25em;
top: .75em;
left: .5em;
}

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View File

@ -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('');
}

2
dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.js vendored
View File

@ -35,7 +35,7 @@
};
if (layoutManager.tv) {
dialogOptions.size = 'fullscreen';
dialogOptions.size = 'medium';
} else {
dialogOptions.size = 'small';
}

6
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View File

@ -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 {

7
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View File

@ -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);

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View File

@ -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"
}

8
dashboard-ui/bower_components/polymer/.bower.json vendored
View File

@ -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"
}

15
dashboard-ui/components/guestinviter/guestinviter.template.html
View File

@ -25,14 +25,13 @@
</div>
<p class="fieldDescription" style="margin-top:.5em;">${MessageGuestSharingPermissionsHelp}</p>
<br />
<button is="emby-button" type="submit" class="raised submit block">
<i class="md-icon">check</i>
<span>${ButtonSendInvitation}</span>
</button>
<br />
<br />
<br />
<br />
<div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
<i class="md-icon">check</i>
<span>${ButtonSendInvitation}</span>
</button>
</div>
</form>
</div>
</div>

2
dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js
View File

@ -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');
}

2
dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
View File

@ -30,7 +30,7 @@
<div class="fieldDescription checkboxFieldDescription">${LabelExtractChaptersDuringLibraryScanHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription chkArhiveAsMediaContainer">
<div class="checkboxContainer checkboxContainer-withDescription chkArhiveAsMediaContainer hide">
<label>
<input type="checkbox" is="emby-checkbox" class="chkArhiveAsMedia" />
<span>${OptionDetectArchiveFilesAsMedia}</span>

1
dashboard-ui/home.html
View File

@ -31,7 +31,6 @@
<div>
<h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="NextUp">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>

2
dashboard-ui/movies.html
View File

@ -27,7 +27,6 @@
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderResume}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Resume">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>
@ -40,7 +39,6 @@
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderLatestMovies}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Latest">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>

3
dashboard-ui/thirdparty/paper-button-style.css vendored
View File

@ -152,7 +152,8 @@ div.dialogHeader {
}
.ui-body-a div.formDialogFooter {
background-color: #e0e0e0;
background-color: #fff;
border-top: 1px solid #ddd;
color: inherit;
}

3
dashboard-ui/tv.html
View File

@ -31,7 +31,6 @@
<div>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Resume">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>
@ -44,7 +43,6 @@
<div>
<h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="NextUp">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>
@ -58,7 +56,6 @@
<div>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestEpisodes}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Latest">
<i class="md-icon">sync</i>
<span>${ButtonSync}</span>
</button>
</div>