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

recording fixes

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-17 12:52:56 -04:00
parent 357932766d
commit b6c9eaadcb
20 changed files with 95 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json vendored
View file

@ -29,14 +29,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior",
"homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
"_release": "1.0.5",
"_resolution": {
"type": "version",
"tag": "v1.0.5",
"commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a"
},
"_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git",
"_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-a11y-keys-behavior"
"_originalSource": "polymerelements/iron-a11y-keys-behavior"
}

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -42,7 +42,7 @@
"tag": "v1.0.3",
"commit": "90b54de14264c19693601b9fc16af6b68a9d48e4"
},
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/paper-behaviors"
"_originalSource": "PolymerElements/paper-behaviors"
}

7
dashboard-ui/itemdetails.html
View file

@ -6,13 +6,6 @@
<body>
<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage lightBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle,tileitemcss,scripts/livetvcomponents">
<div class="itemTabs photoTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><iron-icon icon="photo-album"></iron-icon>${TabAlbums}</a>
<a href="photos.html?tab=1" class="lnkPhotos"><iron-icon icon="photo"></iron-icon>${TabPhotos}</a>
<a href="photos.html?tab=2" class="lnkVideos"><iron-icon icon="videocam"></iron-icon>${TabVideos}</a>
</div>
</div>
<div id="tvShowsTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>

2
dashboard-ui/mysyncjob.html
View file

@ -4,7 +4,7 @@
<title>${TitleSync}</title>
</head>
<body>
<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncjob" data-backbutton="true" data-menubutton="false">
<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncjob,jqmicons" data-backbutton="true" data-menubutton="false">
<div data-role="content">

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

@ -50,7 +50,6 @@
html = LibraryBrowser.getListViewHtml({
items: result.Items,
context: 'tv',
sortBy: query.SortBy
});
trigger = true;
@ -63,7 +62,6 @@
showParentTitle: true,
overlayText: true,
lazy: true,
context: 'tv',
showDetailsMenu: true
});
}
@ -74,7 +72,6 @@
showTitle: true,
showParentTitle: true,
lazy: true,
context: 'tv',
cardLayout: true,
showDetailsMenu: true
});

21
dashboard-ui/scripts/itemdetailpage.js
View file

@ -24,7 +24,7 @@
LibraryBrowser.renderName(item, $('.itemName', page), false, context);
LibraryBrowser.renderParentName(item, $('.parentName', page), context);
LibraryMenu.setTitle(item.Name);
LibraryMenu.setTitle(item.SeriesName || item.Name);
Dashboard.getCurrentUser().done(function (user) {
@ -213,22 +213,7 @@
$('.itemTabs', page).hide();
if (context == 'photos' || context == 'photos-photos') {
$(page).removeClass('noSecondaryNavPage');
var elem = $('.photoTabs', page).show();
$('a', elem).removeClass('ui-btn-active');
if (context == 'photos-photos') {
$('.lnkPhotos', page).addClass('ui-btn-active');
}
else if (context == 'photos-videos') {
$('.lnkVideos', page).addClass('ui-btn-active');
} else {
$('.lnkPhotoAlbums', page).addClass('ui-btn-active');
}
}
else if (context == 'tv') {
if (context == 'tv') {
$(page).removeClass('noSecondaryNavPage');
$('#tvShowsTabs', page).show();
@ -763,7 +748,6 @@
shape: "detailPage169",
showTitle: true,
displayAsSpecial: item.Type == "Season" && item.IndexNumber,
context: context,
playFromHere: true,
overlayText: true,
lazy: true,
@ -777,7 +761,6 @@
shape: "auto",
showTitle: true,
centerText: true,
context: context,
lazy: true,
showDetailsMenu: true
});

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

@ -253,7 +253,7 @@
html += '<div class="lazy drawerUserPanelUserImage" data-src="' + url + '" style="width:' + imgWidth + 'px;height:' + imgWidth + 'px;"></div>';
}
} else {
html += '<div class="fa fa-user drawerUserPanelUserImage" style="font-size:' + imgWidth + 'px;"></div>';
html += '<div class="drawerUserPanelUserImage"><iron-icon icon="person" style="width:' + imgWidth + 'px;height:' + imgWidth + 'px;"></iron-icon></div>';
}
html += '<div class="drawerUserPanelUserName">';

15
dashboard-ui/scripts/moviegenres.js
View file

@ -61,8 +61,17 @@
})).trigger('create');
updateFilterControls(page);
var trigger = false;
if (view == "Thumb") {
if (view == "List") {
html = LibraryBrowser.getListViewHtml({
items: result.Items,
sortBy: query.SortBy
});
trigger = true;
}
else if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
@ -112,6 +121,10 @@
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
if (trigger) {
$(elem).trigger('create');
}
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page);

24
dashboard-ui/scripts/playlists.js
View file

@ -83,7 +83,6 @@
html = LibraryBrowser.getListViewHtml({
items: result.Items,
context: 'playlists',
sortBy: query.SortBy
});
trigger = true;
@ -92,7 +91,6 @@
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'playlists',
showTitle: true,
lazy: true,
coverImage: true,
@ -104,7 +102,6 @@
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'playlists',
showTitle: true,
lazy: true,
coverImage: true,
@ -113,6 +110,27 @@
overlayPlayButton: true
});
}
else if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
centerText: true,
lazy: true,
preferThumb: true
});
}
else if (view == "ThumbCard") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "backdrop",
showTitle: true,
lazy: true,
preferThumb: true,
cardLayout: true,
showItemCounts: true
});
}
$('.noItemsMessage', page).hide();

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

@ -439,7 +439,7 @@
html += '<div>';
html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + Globalize.translate('HeaderLatestTvRecordings') + '</h1>';
html += '<a href="livetvrecordings.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
html += '<a href="livetv.html?tab=3" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
html += '</div>';
}

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

@ -1336,7 +1336,7 @@ var Dashboard = {
html += '<h1 class="pageTitle" style="display:inline-block;">' + (document.title || '&nbsp;') + '</h1>';
if (helpUrl) {
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><i class="fa fa-info-circle"></i>' + Globalize.translate('ButtonHelp') + '</paper-button></a>';
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
}
html += '</div>';

31
dashboard-ui/scripts/sync.js
View file

@ -85,17 +85,17 @@
if (options.showName || dialogOptions.Options.indexOf('Name') != -1) {
html += '<p>';
html += '<label for="txtSyncJobName">' + Globalize.translate('LabelSyncJobName') + '</label>';
html += '<input type="text" id="txtSyncJobName" class="txtSyncJobName" required="required" />';
html += '</p>';
html += '<div>';
html += '<paper-input type="text" id="txtSyncJobName" class="txtSyncJobName" required="required" label="' + Globalize.translate('LabelSyncJobName') + '"></paper-input>';
html += '</div>';
html += '<br/>';
}
html += '<div>';
html += '<label for="selectSyncTarget">' + Globalize.translate('LabelSyncTo') + '</label>';
if (options.readOnlySyncTarget) {
html += '<input type="text" id="selectSyncTarget" readonly="readonly" />';
html += '<paper-input type="text" id="selectSyncTarget" readonly label="' + Globalize.translate('LabelSyncTo') + '"></paper-input>';
} else {
html += '<label for="selectSyncTarget">' + Globalize.translate('LabelSyncTo') + '</label>';
html += '<select id="selectSyncTarget" required="required" data-mini="true">';
html += targets.map(function (t) {
@ -132,17 +132,15 @@
html += '<div class="fldBitrate" style="display:none;">';
html += '<br/>';
html += '<div>';
html += '<label for="txtBitrate">' + Globalize.translate('LabelBitrateMbps') + '</label>';
html += '<input type="number" id="txtBitrate" step=".1" min=".1" />';
html += '<paper-input type="number" step=".1" min=".1" id="txtBitrate" label="' + Globalize.translate('LabelBitrateMbps') + '"></paper-input>';
html += '</div>';
html += '</div>';
if (dialogOptions.Options.indexOf('UnwatchedOnly') != -1) {
html += '<br/>';
html += '<div>';
html += '<label for="chkUnwatchedOnly">' + Globalize.translate('OptionSyncUnwatchedVideosOnly') + '</label>';
html += '<input type="checkbox" id="chkUnwatchedOnly" data-mini="true" />';
html += '<div class="fieldDescription">' + Globalize.translate('OptionSyncUnwatchedVideosOnlyHelp') + '</div>';
html += '<paper-checkbox id="chkUnwatchedOnly">' + Globalize.translate('OptionSyncUnwatchedVideosOnly') + '</paper-checkbox>';
html += '<div class="fieldDescription paperCheckboxFieldDescription">' + Globalize.translate('OptionSyncUnwatchedVideosOnlyHelp') + '</div>';
html += '</div>';
}
@ -156,17 +154,14 @@
if (dialogOptions.Options.indexOf('SyncNewContent') != -1) {
html += '<br/>';
html += '<div>';
html += '<label for="chkSyncNewContent">' + Globalize.translate('OptionAutomaticallySyncNewContent') + '</label>';
html += '<input type="checkbox" id="chkSyncNewContent" data-mini="true" checked="checked" />';
html += '<div class="fieldDescription">' + Globalize.translate('OptionAutomaticallySyncNewContentHelp') + '</div>';
html += '<paper-checkbox id="chkSyncNewContent" checked>' + Globalize.translate('OptionAutomaticallySyncNewContent') + '</paper-checkbox>';
html += '<div class="fieldDescription paperCheckboxFieldDescription">' + Globalize.translate('OptionAutomaticallySyncNewContentHelp') + '</div>';
html += '</div>';
}
if (dialogOptions.Options.indexOf('ItemLimit') != -1) {
html += '<br/>';
html += '<div>';
html += '<label for="txtItemLimit">' + Globalize.translate('LabelItemLimit') + '</label>';
html += '<input type="number" id="txtItemLimit" step="1" min="1" />';
html += '<paper-input type="number" step="1" min="1" id="txtItemLimit" label="' + Globalize.translate('LabelItemLimit') + '"></paper-input>';
html += '<div class="fieldDescription">' + Globalize.translate('LabelItemLimitHelp') + '</div>';
html += '</div>';
}
@ -235,7 +230,7 @@
html += '<div style="margin:1em 0 1.5em;">';
html += '<h1 style="margin: 0;display:inline-block;vertical-align:middle;">' + Globalize.translate('SyncMedia') + '</h1>';
html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><i class="fa fa-info-circle"></i>' + Globalize.translate('ButtonHelp') + '</paper-button></a>';
html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
html += '</div>';
html += '<div class="formFields"></div>';

45
dashboard-ui/scripts/syncjob.js
View file

@ -44,14 +44,10 @@
var html = '';
var cssClass = 'ui-li-has-thumb listItem';
html += '<li class="' + cssClass + '"' + ' data-itemid="' + jobItem.Id + '" data-status="' + jobItem.Status + '" data-remove="' + jobItem.IsMarkedForRemoval + '">';
html += '<paper-icon-item data-itemid="' + jobItem.Id + '" data-status="' + jobItem.Status + '" data-remove="' + jobItem.IsMarkedForRemoval + '">';
var hasActions = ['Queued', 'Cancelled', 'Failed', 'ReadyToTransfer', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1;
html += '<a href="#">';
var imgUrl;
if (jobItem.PrimaryImageItemId) {
@ -65,41 +61,40 @@
}
if (imgUrl) {
if (index < 10) {
html += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
} else {
html += '<div class="listviewImage ui-li-thumb lazy" data-src="' + imgUrl + '"></div>';
html += '<paper-fab class="listAvatar blue" style="background-image:url(\'' + imgUrl + '\');background-repeat:no-repeat;background-position:center center;background-size: cover;" item-icon></paper-fab>';
}
else {
html += '<paper-fab class="listAvatar blue" icon="refresh" item-icon></paper-fab>';
}
html += '<h3>';
html += '<paper-item-body three-line>';
html += '<div>';
html += jobItem.ItemName;
html += '</h3>';
html += '</div>';
if (jobItem.Status == 'Failed') {
html += '<p style="color:red;">';
html += '<div secondary style="color:red;">';
} else {
html += '<p>';
html += '<div secondary>';
}
html += Globalize.translate('SyncJobItemStatus' + jobItem.Status);
if (jobItem.Status == 'Synced' && jobItem.IsMarkedForRemoval) {
html += '<br/>';
html += Globalize.translate('SyncJobItemStatusSyncedMarkForRemoval');
}
html += '</p>';
html += '</div>';
html += '</a>';
html += '</paper-item-body>';
if (hasActions) {
html += '<a href="#" data-icon="ellipsis-v" class="listviewMenuButton btnJobItemMenu">';
html += '<paper-icon-button icon="' + AppInfo.moreIcon + '" class="btnJobItemMenu"></paper-icon-button>';
} else {
html += '<a href="#" data-icon="ellipsis-v" class="listviewMenuButton btnJobItemMenu" style="visibility:hidden;">';
html += '<paper-icon-button icon="' + AppInfo.moreIcon + '" class="btnJobItemMenu" disabled></paper-icon-button>';
}
html += '</a>';
html += '</li>';
html += '</paper-icon-item>';
return html;
}
@ -107,11 +102,9 @@
var html = '';
html += '<ul data-role="listview" class="itemsListview">';
html += '<h1>' + Globalize.translate('HeaderItems') + '</h1>';
html += '<li data-role="list-divider">';
html += Globalize.translate('HeaderItems');
html += '</li>';
html += '<div class="paperList">';
var index = 0;
html += items.map(function (i) {
@ -120,7 +113,7 @@
}).join('');
html += '</ul>';
html += '</div>';
var elem = $('.jobItems', page).html(html).trigger('create').lazyChildren();
@ -132,7 +125,7 @@
function showJobItemMenu(elem) {
var page = $(elem).parents('.page');
var listItem = $(elem).parents('li');
var listItem = $(elem).parents('paper-icon-item');
var jobItemId = listItem.attr('data-itemid');
var status = listItem.attr('data-status');
var remove = listItem.attr('data-remove').toLowerCase() == 'true';

11
dashboard-ui/scripts/tvrecommended.js
View file

@ -14,12 +14,9 @@
Dashboard.showLoadingMsg();
var context = '';
if (LibraryMenu.getTopParentId()) {
$('.scopedContent', page).show();
context = 'tv';
loadResume(page);
@ -27,10 +24,10 @@
$('.scopedContent', page).hide();
}
loadNextUp(page, context || 'home-nextup');
loadNextUp(page);
}
function loadNextUp(page, context) {
function loadNextUp(page) {
var limit = AppInfo.hasLowImageBandwidth ?
16 :
@ -69,7 +66,6 @@
showParentTitle: true,
lazy: true,
cardLayout: true,
context: 'tv',
showDetailsMenu: true
});
@ -81,7 +77,6 @@
showTitle: true,
showParentTitle: true,
overlayText: false,
context: context,
lazy: true,
preferThumb: true,
showDetailsMenu: true,
@ -150,7 +145,6 @@
showParentTitle: true,
lazy: true,
cardLayout: true,
context: 'tv',
showDetailsMenu: true,
preferThumb: true
});
@ -163,7 +157,6 @@
showTitle: true,
showParentTitle: true,
lazy: true,
context: 'tv',
showDetailsMenu: true,
overlayPlayButton: true,
preferThumb: true,

1
dashboard-ui/scripts/tvupcoming.js
View file

@ -109,7 +109,6 @@
showTitle: true,
showPremiereDate: true,
preferThumb: true,
context: 'tv',
lazy: true,
showDetailsMenu: true,
centerText: true

2
dashboard-ui/selectserver.html
View file

@ -12,7 +12,7 @@
<div style="margin:1em 0 .5em;padding-left:5px;">
<h1 style="display:inline-block;vertical-align:middle;margin: 0;">${HeaderSelectServer}</h1>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Emby%20Connect" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><i class="fa fa-info-circle"></i>${ButtonHelp}</paper-button></a>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Emby%20Connect" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
</div>
<div class="serverList"></div>

6
dashboard-ui/themes/ios.css
View file

@ -31,6 +31,10 @@ html, body, .ui-btn, .pageTitle {
display: block !important;
}
.libraryViewNav paper-tabs {
height: 58px !important;
}
.libraryViewNav paper-tab {
height: auto !important;
}
@ -39,7 +43,7 @@ html, body, .ui-btn, .pageTitle {
width: 22px;
height: 22px;
display: block;
margin: -4px auto 6px;
margin: 0 auto 6px;
}
.libraryViewNav #selectionBar {

6
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -411,9 +411,13 @@ paper-textarea.mono textarea {
.paperList {
padding-top: 12px;
background-color: #303030;
margin: 12px auto;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
background-color: #fff;
}
.ui-page-theme-b .paperList {
background-color: #303030;
}
paper-dropdown-menu {

2
dashboard-ui/wizardlibrary.html
View file

@ -14,7 +14,7 @@
<h1 style="display:inline-block;">
<img src="css/images/mblogoicon.png" style="height:30px;vertical-align:middle;margin-right:5px;" />${HeaderSetupLibrary}
</h1>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><paper-button raised class="secondary mini"><i class="fa fa-info-circle"></i>${ButtonHelp}</paper-button></a>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
</div>
<br />

2
dashboard-ui/wizardstart.html
View file

@ -15,7 +15,7 @@
<h1 style="float:left;">
<img src="css/images/mblogoicon.png" style="vertical-align:middle;height:30px;margin-right:5px;" />${WelcomeToProject}
</h1>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><paper-button raised class="secondary mini"><i class="fa fa-info-circle"></i>${ButtonQuickStartGuide}</paper-button></a>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonQuickStartGuide}</span></paper-button></a>
</div>
<br style="clear:both;" />