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

Merge pull request #2077 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-19 02:23:00 -04:00 committed by GitHub
commit ee9ac7bdb2
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,6 +844,10 @@
selectDate(context);
});
context.querySelector('.btnSelectDateIcon').addEventListener('click', function () {
selectDate(context);
});
context.querySelector('.btnUnlockGuide').addEventListener('click', function () {
currentStartIndex = 0;
channelsPromise = null;

3
dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html vendored
View File

@ -21,6 +21,9 @@
</div>
<div style="padding:.25em .5em;" class="guidePaging hide">
<button is="paper-icon-button-light" type="button" class="btnSelectDateIcon">
<i class="md-icon">date_range</i>
</button>
<button is="paper-icon-button-light" type="button" class="btnPreviousPage">
<i class="md-icon">arrow_back</i>
</button>

2
dashboard-ui/css/mediaplayer-video.css
View File

@ -362,6 +362,8 @@ video::-webkit-media-text-track-background {
::cue {
background-color: transparent;
text-shadow: 2px 2px 2px rgba(0, 0, 0, 1);
-webkit-font-smoothing: antialiased;
font-family: inherit;
}
.videoSubtitles {

2
dashboard-ui/dlnaprofile.html
View File

@ -185,7 +185,7 @@
<input type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" />
<div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
</li>
<li>
<li style="display:none;">
<label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
<input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
<div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>

2
dashboard-ui/strings/en-US.json
View File

@ -366,7 +366,7 @@
"LabelAutomaticUpdatesTmdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheMovieDB.org. Existing images will not be replaced. This will cause library scans to take longer and will result in more disk activity.",
"LabelAutomaticUpdatesTvdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheTVDB.com. Existing images will not be replaced. This will cause library scans to take longer and will result in more disk activity.",
"LabelFanartApiKey": "Personal api key:",
"LabelFanartApiKeyHelp": "Requests to fanart without a personal API key return results that were approved over 7 days ago. With a personal API key that drops to 48 hours and if you are also a fanart VIP member that will further drop to around 10 minutes.",
"LabelFanartApiKeyHelp": "Requests to fanart without a personal API key return images that were approved over 7 days ago. With a personal API key that drops to 48 hours and if you are also a fanart VIP member that will further drop to around 10 minutes.",
"ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
"LabelMetadataDownloadLanguage": "Preferred download language:",
"LabelImageSavingConvention": "Image saving convention:",