mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 02:11:53 +00:00
fix button overlap in app show
This commit is contained in:
committed by
Drew Ansbacher
parent
8b03321434
commit
d9374ece18
@@ -1,63 +1,62 @@
|
||||
<ion-item-divider>Status</ion-item-divider>
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col sizeXs="12" sizeSm="3">
|
||||
<ion-item>
|
||||
<ion-label class="label">
|
||||
<status
|
||||
size="x-large"
|
||||
weight="500"
|
||||
[disconnected]="connectionFailure"
|
||||
[installProgress]="(pkg | installState)?.totalProgress"
|
||||
[rendering]="PR[status.primary]"
|
||||
[sigtermTimeout]="pkg.manifest.main['sigterm-timeout']"
|
||||
></status>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
<ion-col sizeXs="12" sizeSm="9">
|
||||
<ion-item>
|
||||
<ng-container *ngIf="isInstalled">
|
||||
<ion-button
|
||||
*ngIf="interfaces | hasUi"
|
||||
slot="end"
|
||||
class="action-button"
|
||||
[disabled]="
|
||||
!(pkg.state | isLaunchable: pkgStatus.main.status:interfaces)
|
||||
"
|
||||
(click)="launchUi()"
|
||||
>
|
||||
Launch UI
|
||||
<ion-icon slot="end" name="open-outline"></ion-icon>
|
||||
</ion-button>
|
||||
<ion-button
|
||||
*ngIf="!pkgStatus.configured"
|
||||
slot="end"
|
||||
class="action-button"
|
||||
(click)="presentModalConfig()"
|
||||
>
|
||||
Configure
|
||||
</ion-button>
|
||||
<ion-button
|
||||
*ngIf="isRunning"
|
||||
slot="end"
|
||||
class="action-button"
|
||||
color="danger"
|
||||
(click)="stop()"
|
||||
>
|
||||
Stop
|
||||
</ion-button>
|
||||
<ion-button
|
||||
*ngIf="isStopped"
|
||||
slot="end"
|
||||
class="action-button"
|
||||
color="success"
|
||||
(click)="tryStart()"
|
||||
>
|
||||
Start
|
||||
</ion-button>
|
||||
</ng-container>
|
||||
</ion-item>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
<ion-item>
|
||||
<ion-label class="label">
|
||||
<status
|
||||
size="x-large"
|
||||
weight="500"
|
||||
[disconnected]="connectionFailure"
|
||||
[installProgress]="(pkg | installState)?.totalProgress"
|
||||
[rendering]="PR[status.primary]"
|
||||
[sigtermTimeout]="pkg.manifest.main['sigterm-timeout']"
|
||||
></status>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
|
||||
<ng-container *ngIf="isInstalled">
|
||||
<ion-item lines="none">
|
||||
<ion-button
|
||||
*ngIf="isRunning"
|
||||
class="action-button"
|
||||
slot="start"
|
||||
color="danger"
|
||||
(click)="stop()"
|
||||
>
|
||||
<ion-icon slot="start" name="stop-outline"></ion-icon>
|
||||
Stop
|
||||
</ion-button>
|
||||
|
||||
<ion-button
|
||||
*ngIf="isStopped"
|
||||
class="action-button"
|
||||
slot="start"
|
||||
color="success"
|
||||
(click)="tryStart()"
|
||||
>
|
||||
<ion-icon slot="start" name="play-outline"></ion-icon>
|
||||
Start
|
||||
</ion-button>
|
||||
|
||||
<ion-button
|
||||
*ngIf="!pkgStatus.configured"
|
||||
class="action-button"
|
||||
slot="start"
|
||||
color="warning"
|
||||
(click)="presentModalConfig()"
|
||||
>
|
||||
<ion-icon slot="start" name="construct-outline"></ion-icon>
|
||||
Configure
|
||||
</ion-button>
|
||||
|
||||
<ion-button
|
||||
*ngIf="interfaces | hasUi"
|
||||
class="action-button"
|
||||
slot="start"
|
||||
color="primary"
|
||||
[disabled]="!(pkg.state | isLaunchable: pkgStatus.main.status:interfaces)"
|
||||
(click)="launchUi()"
|
||||
>
|
||||
<ion-icon slot="start" name="open-outline"></ion-icon>
|
||||
Launch UI
|
||||
</ion-button>
|
||||
</ion-item>
|
||||
</ng-container>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
}
|
||||
|
||||
.action-button {
|
||||
margin: 10px;
|
||||
min-height: 36px;
|
||||
min-width: 120px;
|
||||
margin: 20px 20px 10px 0;
|
||||
min-height: 42px;
|
||||
min-width: 140px;
|
||||
}
|
||||
|
||||
@@ -11,47 +11,61 @@
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
|
||||
<!-- loading -->
|
||||
<ion-item-group *ngIf="loading">
|
||||
<ion-item-divider>
|
||||
<ion-button slot="end" fill="clear">
|
||||
<ion-skeleton-text style="width: 90px; height: 14px; border-radius: 0;" animated></ion-skeleton-text>
|
||||
<ion-skeleton-text
|
||||
style="width: 90px; height: 14px; border-radius: 0"
|
||||
animated
|
||||
></ion-skeleton-text>
|
||||
</ion-button>
|
||||
</ion-item-divider>
|
||||
<ion-item *ngFor="let entry of ['', '', '', '']">
|
||||
<ion-label>
|
||||
<ion-skeleton-text animated style="width: 15%; height: 20px; margin-bottom: 12px;"></ion-skeleton-text>
|
||||
<ion-skeleton-text animated style="width: 50%; margin-bottom: 18px;"></ion-skeleton-text>
|
||||
<ion-skeleton-text animated style="width: 20%;"></ion-skeleton-text>
|
||||
<ion-skeleton-text
|
||||
animated
|
||||
style="width: 15%; height: 20px; margin-bottom: 12px"
|
||||
></ion-skeleton-text>
|
||||
<ion-skeleton-text
|
||||
animated
|
||||
style="width: 50%; margin-bottom: 18px"
|
||||
></ion-skeleton-text>
|
||||
<ion-skeleton-text animated style="width: 20%"></ion-skeleton-text>
|
||||
</ion-label>
|
||||
<ion-button slot="end" fill="clear">
|
||||
<ion-skeleton-text animated style="width: 20px; height: 20px; border-radius: 0"></ion-skeleton-text>
|
||||
<ion-skeleton-text
|
||||
animated
|
||||
style="width: 20px; height: 20px; border-radius: 0"
|
||||
></ion-skeleton-text>
|
||||
</ion-button>
|
||||
</ion-item>
|
||||
</ion-item-group>
|
||||
|
||||
<!-- not loading -->
|
||||
<ng-container *ngIf="!loading">
|
||||
|
||||
<!-- no notifications -->
|
||||
<ion-item-group *ngIf="!notifications.length">
|
||||
<div
|
||||
<div
|
||||
style="
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);"
|
||||
transform: translate(-50%, -50%);
|
||||
"
|
||||
>
|
||||
<ion-icon style="font-size: 84px; color: #595959" name="mail-outline"></ion-icon>
|
||||
<h4 style="color: #595959; margin-top: 0px">Inbox Empty</h4>
|
||||
<ion-icon
|
||||
style="font-size: 84px; color: #595959"
|
||||
name="mail-outline"
|
||||
></ion-icon>
|
||||
<h4 style="color: #595959; margin-top: 0px">Inbox Empty</h4>
|
||||
</div>
|
||||
</ion-item-group>
|
||||
|
||||
|
||||
<!-- has notifications -->
|
||||
<ng-container *ngIf="notifications.length">
|
||||
<ion-item-group style="margin-bottom: 16px;">
|
||||
<ion-item-group style="margin-bottom: 16px">
|
||||
<ion-item-divider>
|
||||
<ion-button slot="end" fill="clear" (click)="presentAlertDeleteAll()">
|
||||
Delete All
|
||||
@@ -61,26 +75,45 @@
|
||||
<ion-label>
|
||||
<h2>
|
||||
<b>
|
||||
<span *ngIf="not['package-id']">{{ not['package-id'] }} - </span>
|
||||
<ion-text [color]="not | notificationColor">{{ not.title }}</ion-text>
|
||||
<span *ngIf="not['package-id']"
|
||||
>{{ not['package-id'] }} -
|
||||
</span>
|
||||
<ion-text [color]="not | notificationColor"
|
||||
>{{ not.title }}</ion-text
|
||||
>
|
||||
</b>
|
||||
</h2>
|
||||
<h2 class="notification-message">
|
||||
{{ not.message | truncateTail: 1000 }}
|
||||
{{ not.message | truncateTail: 240 }}
|
||||
</h2>
|
||||
<p class="view-message-tag">
|
||||
<a class="view-message-tag" *ngIf="not.message.length > 1000" color="dark" (click)="viewFullMessage(not.title, not.message)">
|
||||
<a
|
||||
class="view-message-tag"
|
||||
*ngIf="not.message.length > 240"
|
||||
color="dark"
|
||||
(click)="viewFullMessage(not.title, not.message)"
|
||||
>
|
||||
View Full Message
|
||||
</a>
|
||||
</p>
|
||||
<p>
|
||||
{{ not['created-at'] | date: 'short' }}
|
||||
</p>
|
||||
<p>{{ not['created-at'] | date: 'short' }}</p>
|
||||
</ion-label>
|
||||
<ion-button *ngIf="not.code === 1" slot="end" fill="clear" color="dark" (click)="viewBackupReport(not)">
|
||||
<ion-button
|
||||
*ngIf="not.code === 1"
|
||||
slot="end"
|
||||
fill="clear"
|
||||
color="dark"
|
||||
(click)="viewBackupReport(not)"
|
||||
>
|
||||
View Report
|
||||
</ion-button>
|
||||
<ion-button *ngIf="not['package-id']" slot="end" fill="clear" color="dark" [routerLink]="['/services', not['package-id']]">
|
||||
<ion-button
|
||||
*ngIf="not['package-id']"
|
||||
slot="end"
|
||||
fill="clear"
|
||||
color="dark"
|
||||
[routerLink]="['/services', not['package-id']]"
|
||||
>
|
||||
View Service
|
||||
</ion-button>
|
||||
<ion-button slot="end" fill="clear" (click)="delete(not.id, i)">
|
||||
@@ -88,11 +121,15 @@
|
||||
</ion-button>
|
||||
</ion-item>
|
||||
</ion-item-group>
|
||||
|
||||
<ion-infinite-scroll [disabled]="!needInfinite" (ionInfinite)="doInfinite($event)">
|
||||
<ion-infinite-scroll-content loadingSpinner="lines"></ion-infinite-scroll-content>
|
||||
|
||||
<ion-infinite-scroll
|
||||
[disabled]="!needInfinite"
|
||||
(ionInfinite)="doInfinite($event)"
|
||||
>
|
||||
<ion-infinite-scroll-content
|
||||
loadingSpinner="lines"
|
||||
></ion-infinite-scroll-content>
|
||||
</ion-infinite-scroll>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
</ion-content>
|
||||
</ion-content>
|
||||
|
||||
@@ -5,5 +5,7 @@
|
||||
.view-message-tag {
|
||||
margin-bottom: 8px;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
a {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user