mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fixes #860 - Add options to display channels directly within user views
This commit is contained in:
parent
190377babb
commit
2c9ebd220c
4 changed files with 47 additions and 4 deletions
|
@ -25,7 +25,14 @@
|
|||
</div>
|
||||
|
||||
<br />
|
||||
<div style="margin: 0 1em;">
|
||||
<p>${LabelGroupChannelsIntoViews}</p>
|
||||
<div class="channelGroupList"></div>
|
||||
<div class="fieldDescription">${LabelGroupChannelsIntoViewsHelp}</div>
|
||||
</div>
|
||||
<br />
|
||||
<br />
|
||||
|
||||
<div class="detailSectionHeader" style="margin: 0 .5em;">
|
||||
${HeaderOtherDisplaySettings}
|
||||
</div>
|
||||
|
|
|
@ -219,7 +219,8 @@
|
|||
shape: shape,
|
||||
showTitle: true,
|
||||
centerText: true,
|
||||
lazy: true
|
||||
lazy: true,
|
||||
preferThumb: true
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
|
|
|
@ -374,7 +374,6 @@
|
|||
var page = this;
|
||||
|
||||
hideSelections(page);
|
||||
|
||||
});
|
||||
|
||||
function renderUserDataChanges(posterItem, userData) {
|
||||
|
@ -387,11 +386,11 @@
|
|||
|
||||
$(html).insertAfter($('.posterItemOverlayTarget', posterItem));
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
$('.playedIndicator', posterItem).remove();
|
||||
}
|
||||
|
||||
|
||||
// TODO: Handle progress bar
|
||||
// $('.posterItemProgressContainer').remove();
|
||||
}
|
||||
|
|
|
@ -36,6 +36,37 @@
|
|||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
|
||||
$.getJSON(ApiClient.getUrl("Channels", {
|
||||
|
||||
UserId: user.Id
|
||||
|
||||
})).done(function (result) {
|
||||
|
||||
var folderHtml = '';
|
||||
|
||||
folderHtml += '<div data-role="controlgroup">';
|
||||
folderHtml += result.Items.map(function (i) {
|
||||
|
||||
var currentHtml = '';
|
||||
|
||||
var id = 'chkGroupChannel' + i.Id;
|
||||
|
||||
currentHtml += '<label for="' + id + '">' + i.Name + '</label>';
|
||||
|
||||
var isChecked = user.Configuration.DisplayChannelsWithinViews.indexOf(i.Id) != -1;
|
||||
var checkedHtml = isChecked ? ' checked="checked"' : '';
|
||||
|
||||
currentHtml += '<input class="chkGroupChannel" data-channelid="' + i.Id + '" type="checkbox" data-mini="true" id="' + id + '"' + checkedHtml + ' />';
|
||||
|
||||
return currentHtml;
|
||||
|
||||
}).join('');
|
||||
|
||||
folderHtml += '</div>';
|
||||
|
||||
$('.channelGroupList', page).html(folderHtml).trigger('create');
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
function saveUser(page, user) {
|
||||
|
@ -49,6 +80,11 @@
|
|||
return i.getAttribute('data-folderid');
|
||||
});
|
||||
|
||||
user.Configuration.DisplayChannelsWithinViews = $(".chkGroupChannel:checked", page).get().map(function (i) {
|
||||
|
||||
return i.getAttribute('data-channelid');
|
||||
});
|
||||
|
||||
ApiClient.updateUser(user).done(function () {
|
||||
Dashboard.alert(Globalize.translate('SettingsSaved'));
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue