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

update latest items

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-05 15:34:03 -04:00
parent 30ad844e37
commit 3c571f5ded
8 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.330", "version": "1.4.331",
"_release": "1.4.330", "_release": "1.4.331",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.330", "tag": "1.4.331",
"commit": "14b8b8dd7303142a641995e0cd31a0972786399f" "commit": "922ebb6b3119283fbe0585ccc1b71b87f26bb8ee"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -107,7 +107,7 @@ button {
.btnCardOptions { .btnCardOptions {
position: absolute; position: absolute;
bottom: 0; bottom: .25em;
right: 0; right: 0;
margin: 0 !important; margin: 0 !important;
z-index: 1; z-index: 1;

11
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -689,7 +689,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return 'defaultCardColor' + getDefaultColorIndex(str); return 'defaultCardColor' + getDefaultColorIndex(str);
} }
function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin) { function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin, maxLines) {
var html = ''; var html = '';
@ -714,10 +714,17 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
html += text; html += text;
html += "</div>"; html += "</div>";
valid++; valid++;
if (maxLines && valid >= maxLines) {
break;
}
} }
} }
if (forceLines) { if (forceLines) {
length = Math.min(lines.length, maxLines || lines.length);
while (valid < length) { while (valid < length) {
html += "<div class='" + cssClass + "'>&nbsp;</div>"; html += "<div class='" + cssClass + "'>&nbsp;</div>";
valid++; valid++;
@ -985,7 +992,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines = []; lines = [];
} }
html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText); html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText, options.lines);
if (progressHtml) { if (progressHtml) {
html += progressHtml; html += progressHtml;

2
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -152,7 +152,7 @@
.paper-icon-button-light > i { .paper-icon-button-light > i {
width: 1em; width: 1em;
height: 1em; height: 1em;
font-size: 1.7em; font-size: 1.6em;
/* Make sure its on top of the ripple */ /* Make sure its on top of the ripple */
position: relative; position: relative;
z-index: 1; z-index: 1;

5
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -24,6 +24,8 @@ _:-ms-input-placeholder, :root .mdl-slider {
z-index: 1; z-index: 1;
cursor: pointer; cursor: pointer;
margin: 0; margin: 0;
/* Disable webkit tap highlighting */
-webkit-tap-highlight-color: rgba(0,0,0,0);
/**************************** Tracks ****************************/ /**************************** Tracks ****************************/
/**************************** Thumbs ****************************/ /**************************** Thumbs ****************************/
/**************************** 0-value ****************************/ /**************************** 0-value ****************************/
@ -224,6 +226,7 @@ _:-ms-input-placeholder, :root .mdl-slider {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.sliderBubbleText { .sliderBubbleText {
margin: 0; margin: 0;
} }

8
dashboard-ui/css/librarymenu.css
View file

@ -73,25 +73,20 @@
.libraryMenuButtonText { .libraryMenuButtonText {
text-decoration: none; text-decoration: none;
font-weight: 400 !important;
display: inline-flex; display: inline-flex;
vertical-align: middle; vertical-align: middle;
padding-left: 0 !important; padding-left: 0 !important;
cursor: default; cursor: default;
position: relative;
top: 1px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
align-items: center; align-items: center;
margin-left: .75em; margin: 0 0 0 .5em;
font-size: 108%;
/* Avoid pushing right header off the screen */ /* Avoid pushing right header off the screen */
flex-shrink: 1; flex-shrink: 1;
} }
.viewMenuBar { .viewMenuBar {
font-weight: bold;
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
@ -101,7 +96,6 @@
height: 50px; height: 50px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-size: 13px;
} }
.hiddenViewMenuBar .viewMenuBar { .hiddenViewMenuBar .viewMenuBar {

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

@ -22,7 +22,7 @@
html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><i class="md-icon">menu</i></button>'; html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><i class="md-icon">menu</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerAppsButton barsMenuButton headerButtonLeft"><i class="md-icon">home</i></button>'; html += '<button type="button" is="paper-icon-button-light" class="headerButton headerAppsButton barsMenuButton headerButtonLeft"><i class="md-icon">home</i></button>';
html += '<div class="libraryMenuButtonText headerButton">' + Globalize.translate('ButtonHome') + '</div>'; html += '<h3 class="libraryMenuButtonText headerButton">' + Globalize.translate('ButtonHome') + '</h3>';
html += '<div class="viewMenuSecondary">'; html += '<div class="viewMenuSecondary">';

51
dashboard-ui/scripts/tvlatest.js
View file

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder'], function (categorysyncbuttons, groupedcards, cardBuilder) { define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder', 'apphost'], function (categorysyncbuttons, groupedcards, cardBuilder, appHost) {
'use strict'; 'use strict';
function getView() { function getView() {
@ -31,40 +31,27 @@
promise.then(function (items) { promise.then(function (items) {
var view = getView();
var html = ''; var html = '';
if (view == 'ThumbCard') { var supportsImageAnalysis = appHost.supports('imageanalysis');
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: items, items: items,
shape: "backdrop", shape: "backdrop",
preferThumb: true, preferThumb: true,
inheritThumb: false, showTitle: true,
showUnplayedIndicator: false, showSeriesYear: true,
showChildCountIndicator: true, showParentTitle: true,
showParentTitle: true, overlayText: false,
lazy: true, cardLayout: true,
showTitle: true, showUnplayedIndicator: false,
cardLayout: true showChildCountIndicator: true,
}); centerText: false,
lazy: true,
} else if (view == 'Thumb') { overlayPlayButton: true,
vibrant: supportsImageAnalysis,
html += cardBuilder.getCardsHtml({ lines: 2
items: items, });
shape: "backdrop",
preferThumb: true,
inheritThumb: false,
showParentTitle: false,
showUnplayedIndicator: false,
showChildCountIndicator: true,
centerText: true,
lazy: true,
showTitle: false,
overlayPlayButton: true
});
}
var elem = context.querySelector('#latestEpisodes'); var elem = context.querySelector('#latestEpisodes');
elem.innerHTML = html; elem.innerHTML = html;