Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix layout issues for device cards on dashboard #430

Merged
merged 1 commit into from Sep 2, 2019
Merged

Fix layout issues for device cards on dashboard #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/indicators/indicators.js
View file
Open in desktop
Expand Up @@ -221,6 +221,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
});

return {
getProgressHtml: getProgressHtml,
getProgressBarHtml: getProgressBarHtml,
getPlayedIndicatorHtml: getPlayedIndicator,
getChildCountIndicatorHtml: getChildCountIndicatorHtml,
Expand Down
26 changes: 13 additions & 13 deletions src/controllers/dashboardpage.js
View file
Open in desktop
@@ -1,4 +1,4 @@
define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "scripts/imagehelper", "humanedate", "listViewStyle", "emby-button", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper) {
define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "scripts/imagehelper", "indicators", "humanedate", "listViewStyle", "emby-button", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) {
"use strict";

function buttonEnabled(elem, enabled) {
Expand Down Expand Up @@ -249,20 +249,19 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
html += '<div class="cardScalable visualCardBox-cardScalable">';
html += '<div class="cardPadder cardPadder-backdrop"></div>';
html += '<div class="cardContent">';
var imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem);

var imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem);
if (imgUrl) {
html += '<div class="sessionNowPlayingContent sessionNowPlayingContent-withbackground"';
html += ' data-src="' + imgUrl + '" style="display:inline-block;background-image:url(\'' + imgUrl + "');\"";
html += ' data-src="' + imgUrl + '" style="display:inline-block;background-image:url(\'' + imgUrl + "');\"></div>";
} else {
html += '<div class="sessionNowPlayingContent"';
html += '<div class="sessionNowPlayingContent"></div>';
}

html += "></div>";
html += '<div class="sessionNowPlayingInnerContent">';
html += '<div class="sessionAppInfo">';
var clientImage = DashboardPage.getClientImage(session);

var clientImage = DashboardPage.getClientImage(session);
if (clientImage) {
html += clientImage;
}
Expand All @@ -272,28 +271,29 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
html += '<div class="sessionAppSecondaryText">' + DashboardPage.getAppSecondaryText(session) + "</div>";
html += "</div>";
html += "</div>";
html += '<div class="sessionNowPlayingTime">' + DashboardPage.getSessionNowPlayingTime(session) + "</div>";

if (session.TranscodingInfo && session.TranscodingInfo.Framerate) {
html += '<div class="sessionTranscodingFramerate">' + session.TranscodingInfo.Framerate + " fps</div>";
} else {
html += '<div class="sessionTranscodingFramerate"></div>';
}

html += '<div class="sessionNowPlayingDetails">'
var nowPlayingName = DashboardPage.getNowPlayingName(session);
html += '<div class="sessionNowPlayingInfo" data-imgsrc="' + nowPlayingName.image + '">';
html += nowPlayingName.html;
html += "</div>";
html += '<div class="sessionNowPlayingTime">' + DashboardPage.getSessionNowPlayingTime(session) + "</div>";
html += '</div>'

if (nowPlayingItem && nowPlayingItem.RunTimeTicks) {
html += '<progress class="playbackProgress" min="0" max="100" value="' + 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks + '"></progress>';
} else {
html += '<progress class="playbackProgress hide" min="0" max="100"></progress>';
var percent = 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks;
html += indicators.getProgressHtml(percent, { containerClass: "playbackProgress" });
}

if (session.TranscodingInfo && session.TranscodingInfo.CompletionPercentage) {
html += '<progress class="transcodingProgress" min="0" max="100" value="' + session.TranscodingInfo.CompletionPercentage.toFixed(1) + '"></progress>';
} else {
html += '<progress class="transcodingProgress hide" min="0" max="100"></progress>';
var percent = session.TranscodingInfo.CompletionPercentage.toFixed(1);
html += indicators.getProgressHtml(percent, { containerClass: "transcodingProgress" });
}

html += "</div>";
Expand Down
108 changes: 31 additions & 77 deletions src/css/dashboard.css
View file
Open in desktop
Expand Up @@ -272,10 +272,9 @@ div[data-role=controlgroup] a.ui-btn-active {
position: relative
}

.sessionAppInfo,
.sessionNowPlayingInfo {
padding: .5em;
overflow: hidden
.sessionAppInfo {
padding: 0.5em;
overflow: hidden;
}

.sessionCardButtons {
Expand Down Expand Up @@ -317,105 +316,60 @@ div[data-role=controlgroup] a.ui-btn-active {
max-width: 200px
}

.sessionNowPlayingInfo {
.sessionNowPlayingDetails {
display: flex;
position: absolute;
left: 0;
bottom: 11px;
max-width: 50%;
-o-text-overflow: ellipsis;
text-overflow: ellipsis
}

.sessionAppInfo img {
max-width: 32px;
max-height: 32px;
margin-right: 5px
bottom: 0px;
width: 100%;
}

.activeSession .playbackProgress {
position: absolute;
right: 0;
bottom: 0;
left: 0;
height: 7px;
width: 100%;
opacity: .95
.sessionNowPlayingInfo {
flex-grow: 1;
text-overflow: ellipsis;
padding: 0.8em 0.5em;
}

.activeSession:not(.playingSession) .sessionNowPlayingInfo {
bottom: 0
.sessionAppInfo img {
max-width: 40px;
max-height: 40px;
margin-right: 8px;
}

.sessionNowPlayingTime {
position: absolute;
right: 10px;
bottom: 19px
flex-shrink: 0;
align-self: flex-end;
text-overflow: ellipsis;
padding: 0.8em 0.5em;
}

.sessionNowPlayingStreamInfo {
white-space: nowrap
white-space: nowrap;
}

.activeSession .playbackProgress,
.activeSession .transcodingProgress {
position: absolute;
right: 0;
bottom: 0;
left: 0;
height: 5px;
height: 6px;
width: 100%;
opacity: .9;
position: absolute
}

.playbackProgress,
.transcodingProgress {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
margin: 0 5px 0 0;
height: 14px;
border: 0 solid #222;
-webkit-border-radius: 0;
border-radius: 0;
width: 50px;
background: #000 !important
}

.playbackProgress::-webkit-progress-bar,
.transcodingProgress::-webkit-progress-bar {
background: #000
}

.transcodingSession .playbackProgress {
bottom: 5px
}

.transcodingProgress::-moz-progress-bar {
border-radius: .3em;
background-color: #dd4919
}

.transcodingProgress::-webkit-progress-value {
-webkit-border-radius: .3em;
border-radius: .3em;
background-color: #dd4919
}

.transcodingProgress[aria-valuenow]:before {
-webkit-border-radius: .3em;
border-radius: .3em;
background-color: #dd4919
}

.playbackProgress::-moz-progress-bar {
background-color: #00a4dc
margin: 0px;
width: 100%;
background: transparent !important;
}

.playbackProgress::-webkit-progress-value {
background-color: #00a4dc
.playbackProgress > div {
z-index: 1000;
background-color: #00a4dc;
}

.playbackProgress[aria-valuenow]:before {
background-color: #00a4dc
.transcodingProgress > div {
background-color: #dd4919;
}

@media all and (max-width:34.375em) {
Expand Down