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

beginning dlna server

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-10 11:06:54 -04:00
parent d5163c5ded
commit d14503c09a
8 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/css/detailtable.css
View file

@ -56,6 +56,11 @@
white-space: nowrap; white-space: nowrap;
} }
.detailTableButtonsCell button {
margin-top: 0;
margin-bottom: 0;
}
.detailTableButtonsCell button + button { .detailTableButtonsCell button + button {
margin-left: .5em; margin-left: .5em;
} }

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

@ -590,7 +590,7 @@ a.itemTag:hover {
} }
.lblDetailTab { .lblDetailTab {
font-size: 16px!important; font-size: 15px!important;
font-weight: 400!important; font-weight: 400!important;
font-family: 'Open Sans'; font-family: 'Open Sans';
padding: .5em 1em; padding: .5em 1em;
@ -710,14 +710,12 @@ a.itemTag:hover {
} }
.itemBackdrop { .itemBackdrop {
background-image: none!important;
height: auto; height: auto;
} }
.itemBackdropContent { .itemBackdropContent {
position: static; position: static;
padding: 1em 1em 0; padding: 1em 1em .5em;
background-color: transparent;
} }
.itemDetailImage { .itemDetailImage {

7
dashboard-ui/itemdetails.html
View file

@ -138,19 +138,18 @@
<a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a> <a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
<a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a> <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
</div> </div>
<p class="itemGenres mobileGenres"></p>
<p class="itemOverview mobileOverview"></p>
</div> </div>
<a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="${ButtonPrevious}" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonPrevious}</a> <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="${ButtonPrevious}" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonPrevious}</a>
<a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="${ButtonNext}" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonNext}</a> <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="${ButtonNext}" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonNext}</a>
<p class="itemGenres mobileGenres"></p>
<p class="itemOverview mobileOverview"></p>
</div> </div>
<div data-role="content"> <div data-role="content">
<div class="detailPageContent"> <div class="detailPageContent">
<div id="detailsSection" class="detailSection hide"> <div id="detailsSection" class="detailSection hide">
<br /> <div class="tabButtons" style="margin-top: .75em;"></div>
<div class="tabButtons"></div>
<div class="detailSectionContent" style="padding: .25em .7em 0;"> <div class="detailSectionContent" style="padding: .25em .7em 0;">

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

@ -426,7 +426,8 @@
html += LibraryBrowser.getSongTableHtml(result.Items, { html += LibraryBrowser.getSongTableHtml(result.Items, {
showAlbum: true, showAlbum: true,
showArtist: true showArtist: true,
showAlbumArtist: true
}); });
} }

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

@ -912,7 +912,7 @@
$('#themeSongsCollapsible', page).show(); $('#themeSongsCollapsible', page).show();
$('#themeSongsContent', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true, showAlbum: true })).trigger('create'); $('#themeSongsContent', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true, showAlbum: true, showAlbumArtist: true })).trigger('create');
} else { } else {
$('#themeSongsCollapsible', page).hide(); $('#themeSongsCollapsible', page).hide();
} }

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

@ -185,14 +185,17 @@
html += '<tr>'; html += '<tr>';
html += LibraryBrowser.getSongHeaderCellHtml('', '', options.enableColumnSorting); html += LibraryBrowser.getSongHeaderCellHtml('', '', options.enableColumnSorting);
html += LibraryBrowser.getSongHeaderCellHtml('', '', options.enableColumnSorting); html += LibraryBrowser.getSongHeaderCellHtml('Disc', 'desktopColumn', options.enableColumnSorting);
html += LibraryBrowser.getSongHeaderCellHtml('#', 'desktopColumn', options.enableColumnSorting);
html += LibraryBrowser.getSongHeaderCellHtml('Track', '', options.enableColumnSorting, 'Name', options.sortBy, options.sortOrder); html += LibraryBrowser.getSongHeaderCellHtml('Track', '', options.enableColumnSorting, 'Name', options.sortBy, options.sortOrder);
if (options.showAlbum) { if (options.showAlbum) {
html += LibraryBrowser.getSongHeaderCellHtml('Album', '', options.enableColumnSorting, 'Album,SortName', options.sortBy, options.sortOrder); html += LibraryBrowser.getSongHeaderCellHtml('Album', '', options.enableColumnSorting, 'Album,SortName', options.sortBy, options.sortOrder);
} }
if (options.showArtist) { if (options.showArtist) {
html += LibraryBrowser.getSongHeaderCellHtml('Artist', '', options.enableColumnSorting, 'Artist,Album,SortName', options.sortBy, options.sortOrder); html += LibraryBrowser.getSongHeaderCellHtml('Artist', 'tabletColumn', options.enableColumnSorting, 'Artist,Album,SortName', options.sortBy, options.sortOrder);
}
if (options.showAlbumArtist) {
html += LibraryBrowser.getSongHeaderCellHtml('Album Artist', 'tabletColumn', options.enableColumnSorting, 'AlbumArtist,Album,SortName', options.sortBy, options.sortOrder); html += LibraryBrowser.getSongHeaderCellHtml('Album Artist', 'tabletColumn', options.enableColumnSorting, 'AlbumArtist,Album,SortName', options.sortBy, options.sortOrder);
} }
@ -214,12 +217,8 @@
html += '<button class="btnQueue" data-icon="plus" type="button" data-iconpos="notext" onclick="MediaController.queue(\'' + item.Id + '\');" data-inline="true" title="Queue">Queue</button>'; html += '<button class="btnQueue" data-icon="plus" type="button" data-iconpos="notext" onclick="MediaController.queue(\'' + item.Id + '\');" data-inline="true" title="Queue">Queue</button>';
html += '</td>'; html += '</td>';
var num = item.IndexNumber; html += '<td class="desktopColumn">' + (item.ParentIndexNumber || "") + '</td>';
html += '<td class="desktopColumn">' + (item.IndexNumber || "") + '</td>';
if (num && item.ParentIndexNumber) {
num = item.ParentIndexNumber + "." + num;
}
html += '<td>' + (num || "") + '</td>';
html += '<td><a href="' + LibraryBrowser.getHref(item, "music") + '">' + (item.Name || "") + '</a></td>'; html += '<td><a href="' + LibraryBrowser.getHref(item, "music") + '">' + (item.Name || "") + '</a></td>';
@ -237,14 +236,14 @@
var artistLinksHtml = LibraryBrowser.getArtistLinksHtml(item.Artists); var artistLinksHtml = LibraryBrowser.getArtistLinksHtml(item.Artists);
html += '<td>' + artistLinksHtml + '</td>'; html += '<td class="tabletColumn">' + artistLinksHtml + '</td>';
} }
else { else {
html += '<td></td>'; html += '<td class="tabletColumn"></td>';
} }
} }
if (options.showArtist) { if (options.showAlbumArtist) {
if (item.AlbumArtist) { if (item.AlbumArtist) {

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

@ -649,7 +649,7 @@
} }
// Just use the first audio stream // Just use the first audio stream
return audioStreams[0].Index; return audioStreams.length ? audioStreams[0].Index : null;
} }
function getVideoQualityOptions(mediaStreams) { function getVideoQualityOptions(mediaStreams) {

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

@ -50,6 +50,7 @@
html += LibraryBrowser.getSongTableHtml(result.Items, { html += LibraryBrowser.getSongTableHtml(result.Items, {
showAlbum: true, showAlbum: true,
showArtist: true, showArtist: true,
showAlbumArtist: true,
enableColumnSorting: true, enableColumnSorting: true,
sortBy: query.SortBy, sortBy: query.SortBy,
sortOrder: query.SortOrder sortOrder: query.SortOrder