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

add custom collection sort orders to edit page

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-03 15:32:27 -05:00
parent 708ca5d32f
commit 5057ffec65
12 changed files with 86 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
dashboard-ui/css/images/items/list/person.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

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

@ -798,26 +798,26 @@ a.itemTag:hover {
.posterRibbon { .posterRibbon {
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 5px;
right: 0; right: 5px;
text-align: center; text-align: center;
padding: 5px 5px; padding: 5px 6px;
border-bottom-left-radius: 10px; border-radius: 10px;
color: #fff; color: #fff;
background: rgb(0, 143, 187); background: rgb(0, 143, 187);
background: rgba(0, 143, 187, .8); background: rgba(0, 143, 187, .8);
} }
.offlinePosterRibbon { .offlinePosterRibbon {
background: rgb(255, 106, 0); background: rgba(248, 58, 34, .8);
} }
.unairedPosterRibbon { .unairedPosterRibbon {
background: rgb(208, 107, 100); background: rgba(255, 106, 0, .8);
} }
.missingPosterRibbon { .missingPosterRibbon {
background: rgb(248, 58, 34); background: rgba(248, 58, 34, .8);
} }
.unplayedIndicator { .unplayedIndicator {

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

@ -27,8 +27,6 @@
} }
.nowPlayingBarImage { .nowPlayingBarImage {
border: 1px solid #444!important;
padding: 1px;
vertical-align: bottom; vertical-align: bottom;
} }
@ -77,7 +75,7 @@
z-index: 99998; z-index: 99998;
height: auto; height: auto;
width: 270px; width: 270px;
bottom: 46px; bottom: 45px;
left: -290px; left: -290px;
border: 1px solid #666; border: 1px solid #666;
background: #000; background: #000;
@ -198,7 +196,7 @@ input[type="range"]::-ms-fill-upper {
border: 1px solid #999; border: 1px solid #999;
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
bottom: 80px; bottom: 78px;
margin-left: -50px; margin-left: -50px;
max-height: 300px; max-height: 300px;
overflow-y: auto; overflow-y: auto;
@ -258,11 +256,14 @@ input[type="range"]::-ms-fill-upper {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
padding-left: 5px; padding-left: 5px;
font-size: 13px;
font-weight: normal;
} }
.mediaFlyoutOptionSecondaryText { .mediaFlyoutOptionSecondaryText {
font-size: 12px; font-size: 13px;
color: #999; color: #333;
font-weight: normal;
margin-top: 3px; margin-top: 3px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;

9
dashboard-ui/css/site.css
View file

@ -651,7 +651,7 @@ h1 .imageLink {
/* Dashboard home */ /* Dashboard home */
.tblConnections td { .tblConnections td {
padding: 1em 0 1em 1.5em; padding: 1em 0 1em 1.25em;
vertical-align: top; vertical-align: top;
} }
@ -663,9 +663,12 @@ h1 .imageLink {
height: 48px; height: 48px;
} }
.nowPlayingText {
padding-left: .5em!important;
}
.clientNowPlayingImage { .clientNowPlayingImage {
border: 1px solid #aaa; height: 52px;
padding: 1px;
} }
/* Footer */ /* Footer */

10
dashboard-ui/edititemmetadata.html
View file

@ -324,13 +324,19 @@
</div> </div>
</div> </div>
</div> </div>
<div data-role="collapsible" data-mini="true" id="collapsibleSeriesDIsplaySettings" style="display: none;"> <div data-role="collapsible" data-mini="true" id="collapsibleDisplaySettings" style="display: none;">
<h3>Display Settings</h3> <h3>Display Settings</h3>
<div> <div>
<div data-role="fieldcontain"> <div data-role="fieldcontain" id="fldDisplaySpecialsInline" class="fldDisplaySetting">
<label for="chkDisplaySpecialsInline">Display specials within seasons they aired in.</label> <label for="chkDisplaySpecialsInline">Display specials within seasons they aired in.</label>
<input data-mini="true" type="checkbox" name="chkDisplaySpecialsInline" id="chkDisplaySpecialsInline" /> <input data-mini="true" type="checkbox" name="chkDisplaySpecialsInline" id="chkDisplaySpecialsInline" />
</div> </div>
<div data-role="fieldcontain" id="fldDisplayOrder" class="fldDisplaySetting">
<label for="selectDisplayOrder" id="labelDisplayOrder">Display order:</label>
<select id="selectDisplayOrder" data-mini="true">
</select>
</div>
</div> </div>
</div> </div>
<div data-role="collapsible" data-mini="true" id="genresCollapsible" style="display: none;"> <div data-role="collapsible" data-mini="true" id="genresCollapsible" style="display: none;">

35
dashboard-ui/scripts/edititemmetadata.js
View file

@ -665,12 +665,6 @@
$('#fldMusicBrainzReleaseGroupId', page).hide(); $('#fldMusicBrainzReleaseGroupId', page).hide();
} }
if (item.Type == "Series") {
$('#collapsibleSeriesDIsplaySettings', page).show();
} else {
$('#collapsibleSeriesDIsplaySettings', page).hide();
}
if (item.Type == "Episode") { if (item.Type == "Episode") {
$('#collapsibleDvdEpisodeInfo', page).show(); $('#collapsibleDvdEpisodeInfo', page).show();
} else { } else {
@ -780,6 +774,32 @@
} else { } else {
$('#fldParentIndexNumber', page).hide(); $('#fldParentIndexNumber', page).hide();
} }
if (item.Type == "Series") {
$('#fldDisplaySpecialsInline', page).show();
} else {
$('#fldDisplaySpecialsInline', page).hide();
}
if (item.Type == "BoxSet") {
$('#fldDisplayOrder', page).show();
$('#labelDisplayOrder', page).html('Movie display order:');
$('#selectDisplayOrder', page).html('<option></option><option value="SortName">Sort Name</option><option value="PremiereDate">Release Date</option>').selectmenu('refresh');
} else {
$('#fldDisplayOrder', page).hide();
}
var displaySettingFields = $('.fldDisplaySetting', page);
if (displaySettingFields.filter(function (index) {
return displaySettingFields[index].style.display != 'none';
}).length) {
$('#collapsibleDisplaySettings', page).show();
} else {
$('#collapsibleDisplaySettings', page).hide();
}
} }
function fillItemInfo(page, item) { function fillItemInfo(page, item) {
@ -850,6 +870,8 @@
$('#txtAlbum', page).val(item.Album || ""); $('#txtAlbum', page).val(item.Album || "");
$('#txtAlbumArtist', page).val(item.AlbumArtist || ""); $('#txtAlbumArtist', page).val(item.AlbumArtist || "");
$('#selectDisplayOrder', page).val(item.DisplayOrder || "").selectmenu('refresh');
var artists = item.Artists || []; var artists = item.Artists || [];
$('#txtArtist', page).val(artists.join(';')); $('#txtArtist', page).val(artists.join(';'));
@ -1116,6 +1138,7 @@
AirsAfterSeasonNumber: $('#txtAirsAfterSeason', form).val(), AirsAfterSeasonNumber: $('#txtAirsAfterSeason', form).val(),
AirsBeforeEpisodeNumber: $('#txtAirsBeforeEpisode', form).val(), AirsBeforeEpisodeNumber: $('#txtAirsBeforeEpisode', form).val(),
ParentIndexNumber: $('#txtParentIndexNumber', form).val(), ParentIndexNumber: $('#txtParentIndexNumber', form).val(),
DisplayOrder: $('#selectDisplayOrder', form).val(),
Players: $('#txtPlayers', form).val(), Players: $('#txtPlayers', form).val(),
Album: $('#txtAlbum', form).val(), Album: $('#txtAlbum', form).val(),
AlbumArtist: $('#txtAlbumArtist', form).val(), AlbumArtist: $('#txtAlbumArtist', form).val(),

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

@ -1,6 +1,6 @@
var LibraryBrowser = (function (window, document, $, screen, localStorage) { var LibraryBrowser = (function (window, document, $, screen, localStorage) {
var defaultBackground = "#444"; var defaultBackground = "#333";
return { return {
@ -832,10 +832,9 @@
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
imgUrl = 'css/images/items/list/audio.png'; imgUrl = 'css/images/items/list/audio.png';
background = defaultBackground;
} else {
background = defaultBackground;
} }
background = defaultBackground;
} }
else if (item.Type == "Recording" || item.Type == "Program") { else if (item.Type == "Recording" || item.Type == "Program") {
@ -849,10 +848,15 @@
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
imgUrl = 'css/images/items/list/video.png'; imgUrl = 'css/images/items/list/video.png';
background = defaultBackground;
} else {
background = defaultBackground;
} }
background = defaultBackground;
}
else if (item.Type == "Person") {
if (item.Name && options.showTitle) {
imgUrl = 'css/images/items/list/person.png';
}
background = defaultBackground;
} }
else { else {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {

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

@ -25,7 +25,7 @@
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "square", shape: "backdrop",
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
overlayText: true, overlayText: true,

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

@ -52,7 +52,7 @@
$('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({ $('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
items: recordings, items: recordings,
shape: "square", shape: "backdrop",
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
overlayText: true, overlayText: true,
@ -79,7 +79,7 @@
apiClient.getLiveTvRecordings({ apiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(), userId: Dashboard.getCurrentUserId(),
limit: 15, limit: 12,
isRecording: false isRecording: false
}).done(function (result) { }).done(function (result) {

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

@ -982,7 +982,7 @@
var href = LibraryBrowser.getHref(item.CurrentProgram || item); var href = LibraryBrowser.getHref(item.CurrentProgram || item);
html += "<div><a href='" + href + "'><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></a></div>"; html += "<div><a href='" + href + "'><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:40px;display:inline-block;' /></a></div>";
if (item.SeriesName || item.Album || item.CurrentProgram) { if (item.SeriesName || item.Album || item.CurrentProgram) {
html += '<div class="nowPlayingText">' + seriesName + '<br/>' + name + '</div>'; html += '<div class="nowPlayingText">' + seriesName + '<br/>' + name + '</div>';

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

@ -30,9 +30,14 @@
var checkSortOption = $('.radioSortBy:checked', page); var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
html += LibraryBrowser.getPosterDetailViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
context: "movies" shape: "portrait",
context: 'movies',
useAverageAspectRatio: true,
showTitle: true,
showItemCounts: true,
coverImage: true
}); });
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);

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

@ -30,9 +30,14 @@
var checkSortOption = $('.radioSortBy:checked', page); var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
html += LibraryBrowser.getPosterDetailViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
context: "tv" shape: "portrait",
context: 'tv',
useAverageAspectRatio: true,
showTitle: true,
showItemCounts: true,
coverImage: true
}); });
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);