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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Techywarrior 2013-03-27 21:27:48 -07:00
commit 06c6765dda
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -301,8 +301,8 @@ form, .readOnlyContent {
} }
.libraryPage .ui-content { .libraryPage .ui-content {
padding-right: 50px; padding-right: 40px;
padding-left: 50px; padding-left: 40px;
} }
.type-interior > .ui-content { .type-interior > .ui-content {
@ -624,7 +624,7 @@ form, .readOnlyContent {
/* Footer */ /* Footer */
#footer { #footer {
background: #5a5a5a; background: #4C4C4C;
position: fixed; position: fixed;
bottom: -2px; bottom: -2px;
left: -2px; left: -2px;
@ -801,8 +801,14 @@ progress {
/* Now playing bar */ /* Now playing bar */
#nowPlayingBar { #nowPlayingBar {
padding: 10px 20px 8px; padding: 8px 20px;
border-top: 1px solid #5490CC; border-top: 2px solid #D7742B;
}
.nowPlayingBarImage {
border: 1px solid #a7a7a7;
padding: 1px;
vertical-align: bottom;
} }
.mediaButton { .mediaButton {

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

@ -70,12 +70,13 @@
//display image and title //display image and title
var imageTags = item.ImageTags || {}; var imageTags = item.ImageTags || {};
var html = ''; var html = '';
var url = "";
if (item.BackdropImageTags && item.BackdropImageTags.length) { if (item.BackdropImageTags && item.BackdropImageTags.length) {
url = ApiClient.getImageUrl(item.Id, { url = ApiClient.getImageUrl(item.Id, {
type: "Backdrop", type: "Backdrop",
height: 30, height: 36,
tag: item.BackdropImageTags[0] tag: item.BackdropImageTags[0]
}); });
} }
@ -83,7 +84,7 @@
url = ApiClient.getImageUrl(item.Id, { url = ApiClient.getImageUrl(item.Id, {
type: "Thumb", type: "Thumb",
height: 30, height: 36,
tag: item.ImageTags.Thumb tag: item.ImageTags.Thumb
}); });
} }
@ -91,7 +92,7 @@
url = ApiClient.getImageUrl(item.Id, { url = ApiClient.getImageUrl(item.Id, {
type: "Primary", type: "Primary",
height: 30, height: 36,
tag: item.ImageTags.Primary tag: item.ImageTags.Primary
}); });
}else { }else {
@ -99,7 +100,7 @@
} }
var name = item.Name; var name = item.Name;
var series_name = ''; var seriesName = '';
if (item.IndexNumber != null) { if (item.IndexNumber != null) {
name = item.IndexNumber + " - " + name; name = item.IndexNumber + " - " + name;
@ -108,11 +109,11 @@
name = item.ParentIndexNumber + "." + name; name = item.ParentIndexNumber + "." + name;
} }
if (item.SeriesName || item.Album || item.ProductionYear) { if (item.SeriesName || item.Album || item.ProductionYear) {
series_name = item.SeriesName || item.Album || item.ProductionYear; seriesName = item.SeriesName || item.Album || item.ProductionYear;
} }
html += "<div><img class='clientNowPlayingImage' alt='' title='' src='" + url + "' style='height:30px;display:inline-block;' /></div>"; html += "<div><img class='nowPlayingBarImage' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
html += '<div>'+name+'<br/>'+series_name+'</div>'; html += '<div>'+name+'<br/>'+seriesName+'</div>';
$('#mediaInfo', nowPlayingBar).html(html); $('#mediaInfo', nowPlayingBar).html(html);
}, },