mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update recordings

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-26 12:15:06 -05:00
parent 19b034dae6
commit 535387ecd3
15 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -39,7 +39,8 @@ define(['browser'], function (browser) {
function canPlayHlsWithMSE() { function canPlayHlsWithMSE() {
if (window.MediaSource != null) { if (window.MediaSource != null) {
// text tracks don’t work with this in firefox // text tracks don’t work with this in firefox
return !browser.firefox; return true;
//return !browser.firefox;
} }
return false; return false;

13
dashboard-ui/css/card.css
View file

@ -44,7 +44,7 @@
} }
.cardBox { .cardBox {
margin: 1px; margin: 4px;
} }
@media all and (max-width: 800px) { @media all and (max-width: 800px) {
@ -54,6 +54,13 @@
} }
} }
@media all and (min-width: 800px) {
.cardImage {
border-radius: 2px;
}
}
.defaultBackground .cardImage { .defaultBackground .cardImage {
background-color: #303030; background-color: #303030;
} }
@ -62,10 +69,6 @@
background-color: #181818; background-color: #181818;
} }
.homeTopViews .cardImage {
border-radius: 2px;
}
.cardOverlayButtonContainer { .cardOverlayButtonContainer {
position: absolute; position: absolute;
bottom: 0; bottom: 0;

4
dashboard-ui/css/librarybrowser.css
View file

@ -1542,10 +1542,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
display: none !important; display: none !important;
} }
.movieTrailersTabDisabled .movieTrailersTab {
display: none !important;
}
.homeFavoritesDisabled .homeFavoritesTab { .homeFavoritesDisabled .homeFavoritesTab {
display: none !important; display: none !important;
} }

4
dashboard-ui/css/librarymenu.css
View file

@ -403,12 +403,12 @@ body:not(.dashboardDocument) .btnNotifications {
} }
.darkDrawer .sidebarLinkIcon { .darkDrawer .sidebarLinkIcon {
color: #ccc !important; color: #eee !important;
} }
.darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink { .darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink {
color: #fff !important; color: #fff !important;
font-weight: 300 !important; font-weight: normal !important;
} }
.darkDrawer .sidebarHeader { .darkDrawer .sidebarHeader {

9
dashboard-ui/scheduledtask.html
View file

@ -4,7 +4,7 @@
<title>${TitleScheduledTasks}</title> <title>${TitleScheduledTasks}</title>
</head> </head>
<body> <body>
<div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage"> <div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage,paper-input">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -56,8 +56,8 @@
</select> </select>
</li> </li>
<li id="fldTimeOfDay"> <li id="fldTimeOfDay">
<label for="txtTimeOfDay">${LabelTime}</label> <paper-input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" label="${LabelTime}"></paper-input>
<input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" /> <div class="fieldDescription timeFieldExample"></div>
</li> </li>
<li id="fldSelectSystemEvent"> <li id="fldSelectSystemEvent">
<label for="selectSystemEvent" class="selectLabel">${LabelEvent}</label> <label for="selectSystemEvent" class="selectLabel">${LabelEvent}</label>
@ -81,8 +81,7 @@
</select> </select>
</li> </li>
<li> <li>
<label for="txtTimeLimit">${LabelTimeLimitHours}</label> <paper-input id="txtTimeLimit" type="number" pattern="[0-9]*" min="1" step=".5" label="${LabelTimeLimitHours}"></paper-input>
<input id="txtTimeLimit" type="number" pattern="[0-9]*" min="1" step=".5" />
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="check"> <button type="submit" data-theme="b" data-icon="check">

9
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -417,6 +417,9 @@
playNow = true; playNow = true;
} }
// This is needed in setCurrentTrackElement
currentSrc = val;
self.setCurrentTrackElement(currentTrackIndex); self.setCurrentTrackElement(currentTrackIndex);
} }
@ -515,6 +518,12 @@
return false; return false;
} }
if (browserInfo.firefox) {
if ((currentSrc || '').toLowerCase().indexOf('.m3u8') != -1) {
return false;
}
}
return true; return true;
} }

2
dashboard-ui/scripts/librarybrowser.js
View file

@ -2149,7 +2149,7 @@
if (coverImage) { if (coverImage) {
imageCssClass += " coveredCardImage"; imageCssClass += " coveredCardImage";
if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder') { if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder' || item.Type == 'Program' || item.Type == 'Recording') {
imageCssClass += " noScale"; imageCssClass += " noScale";
} }
} }

4
dashboard-ui/scripts/librarymenu.js
View file

@ -76,7 +76,7 @@
var hasImage; var hasImage;
if (user && user.name) { if (user && user.name) {
if (user.imageUrl && AppInfo.enableUserImage) { if (user.imageUrl) {
var userButtonHeight = 26; var userButtonHeight = 26;
@ -292,7 +292,7 @@
var homeHref = window.ApiClient ? 'index.html' : 'selectserver.html?showuser=1'; var homeHref = window.ApiClient ? 'index.html' : 'selectserver.html?showuser=1';
var hasUserImage = user.imageUrl && AppInfo.enableUserImage; var hasUserImage = user.imageUrl;
if (userAtTop) { if (userAtTop) {

3
dashboard-ui/scripts/livetvrecordinglist.js
View file

@ -4,7 +4,8 @@
var query = { var query = {
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
StartIndex: 0 StartIndex: 0,
Fields: "CanDelete,PrimaryImageAspectRatio"
}; };
function reloadItems(page) { function reloadItems(page) {

2
dashboard-ui/scripts/livetvrecordings.js
View file

@ -99,7 +99,7 @@
userId: Dashboard.getCurrentUserId(), userId: Dashboard.getCurrentUserId(),
limit: 12, limit: 12,
IsInProgress: false, IsInProgress: false,
Fields: 'CanDelete' Fields: 'CanDelete,PrimaryImageAspectRatio'
}).then(function (result) { }).then(function (result) {

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -313,7 +313,7 @@
// viblast can help us here // viblast can help us here
//return true; //return true;
return window.MediaSource != null && !browserInfo.firefox; return window.MediaSource;
}; };
self.changeStream = function (ticks, params) { self.changeStream = function (ticks, params) {

4
dashboard-ui/scripts/scheduledtaskpage.js
View file

@ -318,8 +318,12 @@ var ScheduledTaskPage = {
$(document).on('pageinit', "#scheduledTaskPage", function () { $(document).on('pageinit', "#scheduledTaskPage", function () {
var page = this;
$('.addTriggerForm').off('submit', onSubmit).on('submit', onSubmit); $('.addTriggerForm').off('submit', onSubmit).on('submit', onSubmit);
page.querySelector('.timeFieldExample').innerHTML = Globalize.translate('ValueExample', '1:00 PM');
}).on('pageshow', "#scheduledTaskPage", function () { }).on('pageshow', "#scheduledTaskPage", function () {
ScheduledTaskPage.refreshScheduledTask(); ScheduledTaskPage.refreshScheduledTask();

8
dashboard-ui/scripts/site.js
View file

@ -668,7 +668,7 @@ var Dashboard = {
var html = ''; var html = '';
var imgWidth = 48; var imgWidth = 48;
if (user.imageUrl && AppInfo.enableUserImage) { if (user.imageUrl) {
var url = user.imageUrl; var url = user.imageUrl;
if (user.supportsImageParams) { if (user.supportsImageParams) {
@ -1514,7 +1514,6 @@ var AppInfo = {};
if (!AppInfo.hasLowImageBandwidth) { if (!AppInfo.hasLowImageBandwidth) {
AppInfo.enableStudioTabs = true; AppInfo.enableStudioTabs = true;
AppInfo.enableTvEpisodesTab = true; AppInfo.enableTvEpisodesTab = true;
AppInfo.enableMovieTrailersTab = true;
} }
AppInfo.supportsExternalPlayers = true; AppInfo.supportsExternalPlayers = true;
@ -1544,7 +1543,6 @@ var AppInfo = {};
// This currently isn't working on android, unfortunately // This currently isn't working on android, unfortunately
AppInfo.supportsFileInput = !(AppInfo.isNativeApp && isAndroid); AppInfo.supportsFileInput = !(AppInfo.isNativeApp && isAndroid);
AppInfo.enableUserImage = true;
AppInfo.hasPhysicalVolumeButtons = isCordova || isMobile; AppInfo.hasPhysicalVolumeButtons = isCordova || isMobile;
AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp); AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp);
@ -1696,10 +1694,6 @@ var AppInfo = {};
elem.classList.add('tvEpisodesTabDisabled'); elem.classList.add('tvEpisodesTabDisabled');
} }
if (!AppInfo.enableMovieTrailersTab) {
elem.classList.add('movieTrailersTabDisabled');
}
if (!AppInfo.enableSupporterMembership) { if (!AppInfo.enableSupporterMembership) {
elem.classList.add('supporterMembershipDisabled'); elem.classList.add('supporterMembershipDisabled');
} }

2
dashboard-ui/strings/html/server.json
View file

@ -1545,5 +1545,5 @@
"OptionReplaceExistingImages": "Replace existing images", "OptionReplaceExistingImages": "Replace existing images",
"OptionPlayNextEpisodeAutomatically": "Play next episode automatically", "OptionPlayNextEpisodeAutomatically": "Play next episode automatically",
"OptionDownloadImagesInAdvance": "Download all images in advance", "OptionDownloadImagesInAdvance": "Download all images in advance",
"OptionDownloadImagesInAdvanceHelp": "By default, most secondary images are not downloaded until requested by an Emby app. Enable this option to download all images in advance, as new media is imported." "OptionDownloadImagesInAdvanceHelp": "By default, most secondary images are only downloaded when requested by an Emby app. Enable this option to download all images in advance, as new media is imported."
} }

3
dashboard-ui/strings/javascript/javascript.json
View file

@ -969,5 +969,6 @@
"HeaderSelectCodecIntrosPath": "Select Codec Intros Path", "HeaderSelectCodecIntrosPath": "Select Codec Intros Path",
"ButtonLocalRefresh": "Local refresh", "ButtonLocalRefresh": "Local refresh",
"ButtonAddMissingData": "Add missing data only", "ButtonAddMissingData": "Add missing data only",
"ButtonFullRefresh": "Full refresh" "ButtonFullRefresh": "Full refresh",
"ValueExample": "1:00 PM"
} }