cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

3.0.5607.1

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-10 09:06:12 -04:00
parent 5623b7c147
commit 66a896e13d
10 changed files with 169 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dashboard-ui/css/card.css
View File

@ -167,15 +167,11 @@
.cardContent .cardFooter {
position: absolute;
bottom: 0;
background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.7))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */
background: rgba(0, 0, 0, .75);
left: 0;
right: 0;
color: #fff;
color: #eee;
padding: 5px 0 0 0;
max-width: 100%;
}
.cardText {
@ -183,11 +179,15 @@
overflow: hidden;
text-wrap: none;
white-space: nowrap;
padding: 5px 4px 2px;
padding: 5px 5px 2px;
font-weight: 400;
line-height: 1.4;
}
.cardContent .cardFooter .cardText {
font-size: 16px;
}
.cardOverlayInner {
color: #fff;
}
@ -205,8 +205,7 @@
}
.cardContent .cardText {
padding-left: 5px;
padding: 0 5px 4px;
padding: 0 6px 4px 5px;
}
.outerCardFooter .cardText + .cardText {

66
dashboard-ui/css/librarybrowser.css
View File

@ -640,7 +640,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
.detailSection {
vertical-align: top;
margin-bottom: 2.5em;
margin-bottom: 3em;
}
.detailCollapsibleSection:not(.hide) + .detailCollapsibleSection {
@ -1282,53 +1282,77 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
text-decoration: none;
}
.groupingMenu {
width: 240px;
}
.groupingMenuScroller {
max-height: 200px;
min-width: 240px;
overflow-x: hidden;
overflow-y: auto;
padding-right: 8px;
overflow-x: auto;
overflow-y: hidden;
white-space: nowrap;
padding: 1em;
}
@media all and (min-width: 400px) {
.groupingMenuScroller {
min-width: 300px;
.groupingMenu {
width: 360px;
}
}
@media all and (min-width: 500px) {
.groupingMenuScroller {
min-width: 400px;
.groupingMenu {
width: 460px;
}
}
@media all and (min-width: 600px) {
.groupingMenuScroller {
min-width: 500px;
.groupingMenu {
width: 560px;
}
}
@media all and (min-height: 400px) {
@media all and (min-width: 700px) {
.groupingMenuScroller {
max-height: 300px;
.groupingMenu {
width: 660px;
}
}
@media all and (min-height: 500px) {
@media all and (min-width: 800px) {
.groupingMenuScroller {
max-height: 400px;
.groupingMenu {
width: 760px;
}
}
@media all and (min-height: 600px) {
@media all and (min-width: 900px) {
.groupingMenuScroller {
max-height: 500px;
.groupingMenu {
width: 860px;
}
}
@media all and (min-width: 1000px) {
.groupingMenu {
width: 960px;
}
}
@media all and (min-width: 1100px) {
.groupingMenu {
width: 1060px;
}
}
@media all and (min-width: 1200px) {
.groupingMenu {
width: 1160px;
}
}

3
dashboard-ui/scripts/itemdetailpage.js
View File

@ -1512,7 +1512,8 @@
imgUrl = ApiClient.getScaledImageUrl(cast.Id, {
width: 100,
tag: cast.PrimaryImageTag,
type: "primary"
type: "primary",
minScale: 2
});
} else {

7
dashboard-ui/scripts/librarybrowser.js
View File

@ -1115,6 +1115,13 @@
options.shape = 'smallSquare';
squareSize = posterInfo.smallSquareSize;
}
else if (options.shape == 'detailPagePortrait') {
posterWidth = 200;
}
else if (options.shape == 'detailPage169') {
posterWidth = 260;
thumbWidth = 260;
}
var dateText;

120
dashboard-ui/scripts/librarylist.js
View File

@ -528,66 +528,82 @@
}
}
var html = '<div data-role="popup" class="groupingMenu" data-theme="a">';
html += '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>';
html += '<div>';
html += '<ul data-role="listview">';
var html = '<div data-role="popup" class="groupingMenu" data-transition="slide" style="background:rgba(0,0,0,.85);border:0;padding:0;">';
var href = card.href || LibraryBrowser.getHref(item, context);
var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>');
html += '<li data-role="list-divider">' + header + '</li>';
html += '</ul>';
var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '" style="outline:0;">' + item.Name + '</a>');
html += '<h2 style="padding:.5em 1em;background:#222;margin:0;">' + header + '</h2>';
html += '<div class="groupingMenuScroller">';
html += '<ul data-role="listview">';
html += latestItems.map(function (latestItem) {
var itemHtml = '';
href = LibraryBrowser.getHref(latestItem, context);
itemHtml += '<li class="ui-li-has-thumb"><a href="' + href + '">';
var imgUrl;
if (latestItem.ImageTags.Primary) {
// Scaling 400w episode images to 80 doesn't turn out very well
var width = latestItem.Type == 'Episode' ? 160 : 80;
imgUrl = ApiClient.getScaledImageUrl(latestItem.Id, {
width: width,
tag: latestItem.ImageTags.Primary,
type: "Primary",
index: 0
html += LibraryBrowser.getPosterViewHtml({
items: latestItems,
shape: "detailPage169",
showTitle: true,
overlayText: true,
lazy: true,
context: context
});
}
if (imgUrl) {
itemHtml += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
}
itemHtml += '<h3>';
itemHtml += LibraryBrowser.getPosterViewDisplayName(latestItem);
itemHtml += '</h3>';
var date = parseISO8601Date(latestItem.DateCreated, { toLocal: true });
itemHtml += '<p>';
itemHtml += Globalize.translate('LabelAddedOnDate').replace('{0}', date.toLocaleDateString());
itemHtml += '</p>';
itemHtml += '</a></li>';
return itemHtml;
}).join('');
html += '</ul>';
html += '</div>';
//html += '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>';
//html += '<div>';
//html += '<ul data-role="listview">';
html += '</div>';
//var href = card.href || LibraryBrowser.getHref(item, context);
//var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>');
//html += '<li data-role="list-divider">' + header + '</li>';
//html += '</ul>';
//html += '<div class="groupingMenuScroller">';
//html += '<ul data-role="listview">';
//html += latestItems.map(function (latestItem) {
// var itemHtml = '';
// href = LibraryBrowser.getHref(latestItem, context);
// itemHtml += '<li class="ui-li-has-thumb"><a href="' + href + '">';
// var imgUrl;
// if (latestItem.ImageTags.Primary) {
// // Scaling 400w episode images to 80 doesn't turn out very well
// var width = latestItem.Type == 'Episode' ? 160 : 80;
// imgUrl = ApiClient.getScaledImageUrl(latestItem.Id, {
// width: width,
// tag: latestItem.ImageTags.Primary,
// type: "Primary",
// index: 0
// });
// }
// if (imgUrl) {
// itemHtml += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
// }
// itemHtml += '<h3>';
// itemHtml += LibraryBrowser.getPosterViewDisplayName(latestItem);
// itemHtml += '</h3>';
// var date = parseISO8601Date(latestItem.DateCreated, { toLocal: true });
// itemHtml += '<p>';
// itemHtml += Globalize.translate('LabelAddedOnDate').replace('{0}', date.toLocaleDateString());
// itemHtml += '</p>';
// itemHtml += '</a></li>';
// return itemHtml;
//}).join('');
//html += '</ul>';
//html += '</div>';
//html += '</div>';
html += '</div>';
$($.mobile.activePage).append(html);
@ -597,7 +613,7 @@
$(this).off("popupafterclose").remove();
$(card).removeClass('hasContextMenu');
});
}).lazyChildren();
});
e.preventDefault();

40
dashboard-ui/scripts/nowplayingpage.js
View File

@ -647,33 +647,33 @@
var html = '';
ApiClient.getItems(Dashboard.getCurrentUserId(), {
//ApiClient.getItems(Dashboard.getCurrentUserId(), {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Audio",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified,SyncInfo",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
Limit: 100
// SortBy: "SortName",
// SortOrder: "Ascending",
// IncludeItemTypes: "Audio",
// Recursive: true,
// Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified,SyncInfo",
// StartIndex: 0,
// ImageTypeLimit: 1,
// EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
// Limit: 100
}).done(function (result) {
html += LibraryBrowser.getListViewHtml({
items: result.Items,
smallIcon: true
});
$(".playlist", page).html(html).trigger('create').lazyChildren();
});
//}).done(function (result) {
// html += LibraryBrowser.getListViewHtml({
// items: MediaController.playlist(),
// items: result.Items,
// smallIcon: true
// });
// $(".playlist", page).html(html).trigger('create').lazyChildren();
//});
html += LibraryBrowser.getListViewHtml({
items: MediaController.playlist(),
smallIcon: true
});
$(".playlist", page).html(html).trigger('create').lazyChildren();
}

4
dashboard-ui/scripts/photos.js
View File

@ -45,8 +45,8 @@
items: result.Items,
shape: "auto",
context: getParameterByName('context') || 'photos',
showTitle: false,
centerText: true,
showTitle: query.MediaTypes != 'Photo',
overlayText: true,
lazy: true
});

3
dashboard-ui/scripts/site.js
View File

@ -1510,12 +1510,13 @@ var AppInfo = {};
}
}
AppInfo.enableMusicSongsTab = true;
if (!AppInfo.hasLowImageBandwidth) {
AppInfo.enableLatestChannelItems = true;
AppInfo.enableStudioTabs = true;
AppInfo.enablePeopleTabs = true;
AppInfo.enableTvEpisodesTab = true;
AppInfo.enableMusicSongsTab = true;
AppInfo.enableMusicArtistsTab = true;
AppInfo.enableHomeLatestTab = true;
AppInfo.enableMovieTrailersTab = true;

3
dashboard-ui/thirdparty/browser.js vendored
View File

@ -945,7 +945,7 @@
}
// Chrome is Webkit, but Webkit is also Safari.
if (browser.chrome || $.browser.safari) {
if (browser.chrome || browser.safari) {
browser.webkit = true;
}
@ -956,7 +956,6 @@
if (browser.msie && !browser.mobile && userAgent.toLowerCase().indexOf("xbox") != -1) {
browser.tv = true;
}
jQuery.browser = browser;
})(jQuery, window);

9
dashboard-ui/thirdparty/masonry.pkgd.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long