This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new eeba46af9 Fixed issue of acions in list-page. (#2181)
eeba46af9 is described below
commit eeba46af9ff6b275c6fb981e21c788201ef57cf3
Author: Kerwin Bryant <[email protected]>
AuthorDate: Thu Jul 4 08:47:25 2024 +0800
Fixed issue of acions in list-page. (#2181)
---
.../alert/alert-center/alert-center.component.html | 64 +++++------
.../alert-converge/alert-converge.component.html | 40 +++----
.../alert/alert-notice/alert-notice.component.html | 88 +++++++--------
.../alert-setting/alert-setting.component.html | 60 ++++++-----
.../alert-silence/alert-silence.component.html | 34 +++---
.../monitor-form/monitor-form.component.less | 11 ++
.../monitor/monitor-form/monitor-form.component.ts | 2 +-
.../monitor-list/monitor-list.component.html | 118 +++++++++++----------
.../setting/collector/collector.component.html | 68 ++++++------
.../routes/setting/status/status.component.html | 80 +++++++-------
.../app/routes/setting/tags/tags.component.html | 14 +--
web-app/src/styles/theme.less | 6 ++
12 files changed, 315 insertions(+), 270 deletions(-)
diff --git
a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
index 3e78b6a1f..651b40f45 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
@@ -174,37 +174,39 @@
</nz-tag>
</td>
<td nzAlign="center">
- <button
- *ngIf="data.status != 3"
- nz-button
- nzType="primary"
- (click)="onMarkReadOneAlert(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.center.deal' | i18n"
- >
- <i nz-icon nzType="down-circle" nzTheme="outline"></i>
- </button>
- <button
- *ngIf="data.status == 3"
- nz-button
- nzType="primary"
- nzDanger
- (click)="onMarkUnReadOneAlert(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.center.no-deal' | i18n"
- >
- <i nz-icon nzType="up-circle" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzType="primary"
- nzDanger
- (click)="onDeleteOneAlert(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.center.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ *ngIf="data.status != 3"
+ nz-button
+ nzType="primary"
+ (click)="onMarkReadOneAlert(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.center.deal' | i18n"
+ >
+ <i nz-icon nzType="down-circle" nzTheme="outline"></i>
+ </button>
+ <button
+ *ngIf="data.status == 3"
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onMarkUnReadOneAlert(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.center.no-deal' | i18n"
+ >
+ <i nz-icon nzType="up-circle" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneAlert(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.center.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git
a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
index 080cd2e35..29f3a0f69 100644
--- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
+++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
@@ -109,25 +109,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- nz-button
- nzType="primary"
- (click)="onEditAlertConverge(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.converge.edit' | i18n"
- >
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzDanger
- nzType="primary"
- (click)="onDeleteOneAlertConverge(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.converge.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditAlertConverge(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.converge.edit' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzDanger
+ nzType="primary"
+ (click)="onDeleteOneAlertConverge(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.converge.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git
a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
index 6ce9428c6..eae254400 100644
--- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
+++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
@@ -132,25 +132,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- (click)="onEditOneNoticeReceiver(data)"
- [nzTooltipTitle]="'alert.notice.receiver.edit' | i18n"
- nz-button
- nz-tooltip
- nzType="primary"
- >
- <i nz-icon nzTheme="outline" nzType="edit"></i>
- </button>
- <button
- (click)="onDeleteOneNoticeReceiver(data.id)"
- [nzTooltipTitle]="'alert.notice.receiver.delete' | i18n"
- nz-button
- nz-tooltip
- nzDanger
- nzType="primary"
- >
- <i nz-icon nzTheme="outline" nzType="delete"></i>
- </button>
+ <div class="actions">
+ <button
+ (click)="onEditOneNoticeReceiver(data)"
+ [nzTooltipTitle]="'alert.notice.receiver.edit' | i18n"
+ nz-button
+ nz-tooltip
+ nzType="primary"
+ >
+ <i nz-icon nzTheme="outline" nzType="edit"></i>
+ </button>
+ <button
+ (click)="onDeleteOneNoticeReceiver(data.id)"
+ [nzTooltipTitle]="'alert.notice.receiver.delete' | i18n"
+ nz-button
+ nz-tooltip
+ nzDanger
+ nzType="primary"
+ >
+ <i nz-icon nzTheme="outline" nzType="delete"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
@@ -205,25 +207,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- (click)="onEditOneNoticeRule(data)"
- [nzTooltipTitle]="'alert.notice.rule.edit' | i18n"
- nz-button
- nz-tooltip
- nzType="primary"
- >
- <i nz-icon nzTheme="outline" nzType="edit"></i>
- </button>
- <button
- (click)="onDeleteOneNoticeRule(data.id)"
- [nzTooltipTitle]="'alert.notice.rule.delete' | i18n"
- nz-button
- nz-tooltip
- nzDanger
- nzType="primary"
- >
- <i nz-icon nzTheme="outline" nzType="delete"></i>
- </button>
+ <div class="actions">
+ <button
+ (click)="onEditOneNoticeRule(data)"
+ [nzTooltipTitle]="'alert.notice.rule.edit' | i18n"
+ nz-button
+ nz-tooltip
+ nzType="primary"
+ >
+ <i nz-icon nzTheme="outline" nzType="edit"></i>
+ </button>
+ <button
+ (click)="onDeleteOneNoticeRule(data.id)"
+ [nzTooltipTitle]="'alert.notice.rule.delete' | i18n"
+ nz-button
+ nz-tooltip
+ nzDanger
+ nzType="primary"
+ >
+ <i nz-icon nzTheme="outline" nzType="delete"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
@@ -321,7 +325,7 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <span *ngIf="!data.preset">
+ <div *ngIf="!data.preset" class="actions">
<button
(click)="onEditOneNoticeTemplate(data)"
[nzTooltipTitle]="'alert.notice.template.edit' | i18n"
@@ -341,8 +345,8 @@
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
- </span>
- <span *ngIf="data.preset">
+ </div>
+ <div *ngIf="data.preset" class="actions">
<button
(click)="onShowOneNoticeTemplate(data)"
[nzTooltipTitle]="'alert.notice.template.show' | i18n"
@@ -352,7 +356,7 @@
>
<i nz-icon nzTheme="outline" nzType="eye"></i>
</button>
- </span>
+ </div>
</td>
</tr>
</tbody>
diff --git
a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
index 3991f9f1f..1fd6bf65f 100755
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -144,35 +144,37 @@
<nz-switch [(ngModel)]="data.enable"
(ngModelChange)="updateAlertDefine(data)" name="enable"></nz-switch>
</td>
<td nzAlign="center">
- <button
- nz-button
- nzType="primary"
- (click)="onOpenConnectModal(data.id, data.app)"
- nz-tooltip
- [disabled]="data.preset"
- [nzTooltipTitle]="'alert.setting.connect' | i18n"
- >
- <i nz-icon nzType="link" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzType="primary"
- (click)="onEditOneAlertDefine(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.setting.edit' | i18n"
- >
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzDanger
- nzType="primary"
- (click)="onDeleteOneAlertDefine(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.setting.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onOpenConnectModal(data.id, data.app)"
+ nz-tooltip
+ [disabled]="data.preset"
+ [nzTooltipTitle]="'alert.setting.connect' | i18n"
+ >
+ <i nz-icon nzType="link" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditOneAlertDefine(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.setting.edit' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzDanger
+ nzType="primary"
+ (click)="onDeleteOneAlertDefine(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.setting.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git
a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
old mode 100644
new mode 100755
index ebc54e253..f20ebb798
--- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
+++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
@@ -118,19 +118,27 @@
<nz-switch [(ngModel)]="data.enable"
(ngModelChange)="updateAlertSilence(data)" name="enable"></nz-switch>
</td>
<td nzAlign="center">
- <button nz-button nzType="primary"
(click)="onEditAlertSilence(data.id)" nz-tooltip
[nzTooltipTitle]="'alert.silence.edit' | i18n">
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzDanger
- nzType="primary"
- (click)="onDeleteOneAlertSilence(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'alert.silence.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditAlertSilence(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.silence.edit' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzDanger
+ nzType="primary"
+ (click)="onDeleteOneAlertSilence(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'alert.silence.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git
a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.less
b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.less
new file mode 100644
index 000000000..a4d26c668
--- /dev/null
+++ b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.less
@@ -0,0 +1,11 @@
+:host {
+ ::ng-deep {
+ .ant-collapse-content-box {
+ :last-child {
+ .ant-form-item {
+ margin-bottom: 0!important;
+ }
+ }
+ }
+ }
+}
diff --git
a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
index d28d9fa79..45906dd01 100644
--- a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
@@ -27,7 +27,7 @@ import { ParamDefine } from '../../../pojo/ParamDefine';
@Component({
selector: 'app-monitor-form',
templateUrl: './monitor-form.component.html',
- styles: []
+ styleUrls: ['./monitor-form.component.less']
})
export class MonitorFormComponent {
@Input() monitor!: any;
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index 772a39ba1..ec3456704 100755
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -204,64 +204,66 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate :
data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
- <button nz-button nzType="primary" [routerLink]="['/monitors/' +
data.id]" nz-tooltip [nzTooltipTitle]="'monitors.detail' | i18n">
- <i nz-icon nzType="area-chart" nzTheme="outline"></i>
- </button>
- <button nz-button nz-dropdown [nzDropdownMenu]="more_menu">
- <span nz-icon nzType="ellipsis"></span>
- </button>
- <nz-dropdown-menu #more_menu="nzDropdownMenu">
- <ul nz-menu>
- <li nz-menu-item>
- <button
- nz-button
- nzType="primary"
- (click)="onEditOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.edit-monitor' | i18n"
- >
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- </li>
- <li nz-menu-item>
- <button
- *ngIf="data.status == 0"
- nz-button
- nzType="primary"
- (click)="onEnableManageOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.enable' | i18n"
- >
- <i nz-icon nzType="play-circle" nzTheme="outline"></i>
- </button>
- </li>
- <li nz-menu-item>
- <button
- *ngIf="data.status != 0"
- nz-button
- nzDanger
- nzType="primary"
- (click)="onCancelManageOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.cancel' | i18n"
- >
- <i nz-icon nzType="pause-circle" nzTheme="outline"></i>
- </button>
- </li>
- <li nz-menu-item>
- <button
- nz-button
- nzType="primary"
- nzDanger
- (click)="onDeleteOneMonitor(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'monitors.delete-monitor' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
- </li>
- </ul>
- </nz-dropdown-menu>
+ <div class="actions">
+ <button nz-button nzType="primary" [routerLink]="['/monitors/' +
data.id]" nz-tooltip [nzTooltipTitle]="'monitors.detail' | i18n">
+ <i nz-icon nzType="area-chart" nzTheme="outline"></i>
+ </button>
+ <button nz-button nz-dropdown [nzDropdownMenu]="more_menu">
+ <span nz-icon nzType="ellipsis"></span>
+ </button>
+ <nz-dropdown-menu #more_menu="nzDropdownMenu">
+ <ul nz-menu>
+ <li nz-menu-item>
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.edit-monitor' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ *ngIf="data.status == 0"
+ nz-button
+ nzType="primary"
+ (click)="onEnableManageOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.enable' | i18n"
+ >
+ <i nz-icon nzType="play-circle" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ *ngIf="data.status != 0"
+ nz-button
+ nzDanger
+ nzType="primary"
+ (click)="onCancelManageOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.cancel' | i18n"
+ >
+ <i nz-icon nzType="pause-circle" nzTheme="outline"></i>
+ </button>
+ </li>
+ <li nz-menu-item>
+ <button
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneMonitor(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'monitors.delete-monitor' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </li>
+ </ul>
+ </nz-dropdown-menu>
+ </div>
</td>
</tr>
</tbody>
diff --git a/web-app/src/app/routes/setting/collector/collector.component.html
b/web-app/src/app/routes/setting/collector/collector.component.html
index ca24da5d8..477759ebc 100644
--- a/web-app/src/app/routes/setting/collector/collector.component.html
+++ b/web-app/src/app/routes/setting/collector/collector.component.html
@@ -140,39 +140,41 @@
{{ (data.collector.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss')?.trim() }}
</td>
<td nzAlign="center">
- <button
- *ngIf="data.collector.status == 1"
- [disabled]="data.collector.name == 'main-default-collector'"
- nz-button
- nzType="primary"
- (click)="onGoOnlineOneCollector(data.collector.name)"
- nz-tooltip
- [nzTooltipTitle]="'collector.online' | i18n"
- >
- <i nz-icon nzType="up-circle" nzTheme="outline"></i>
- </button>
- <button
- *ngIf="data.collector.status == 0"
- [disabled]="data.collector.name == 'main-default-collector'"
- nz-button
- nzType="primary"
- (click)="onGoOfflineOneCollector(data.collector.name)"
- nz-tooltip
- [nzTooltipTitle]="'collector.offline' | i18n"
- >
- <i nz-icon nzType="down-circle" nzTheme="outline"></i>
- </button>
- <button
- [disabled]="data.collector.name == 'main-default-collector'"
- nz-button
- nzType="primary"
- nzDanger
- (click)="onDeleteOneCollector(data.collector.name)"
- nz-tooltip
- [nzTooltipTitle]="'collector.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ *ngIf="data.collector.status == 1"
+ [disabled]="data.collector.name == 'main-default-collector'"
+ nz-button
+ nzType="primary"
+ (click)="onGoOnlineOneCollector(data.collector.name)"
+ nz-tooltip
+ [nzTooltipTitle]="'collector.online' | i18n"
+ >
+ <i nz-icon nzType="up-circle" nzTheme="outline"></i>
+ </button>
+ <button
+ *ngIf="data.collector.status == 0"
+ [disabled]="data.collector.name == 'main-default-collector'"
+ nz-button
+ nzType="primary"
+ (click)="onGoOfflineOneCollector(data.collector.name)"
+ nz-tooltip
+ [nzTooltipTitle]="'collector.offline' | i18n"
+ >
+ <i nz-icon nzType="down-circle" nzTheme="outline"></i>
+ </button>
+ <button
+ [disabled]="data.collector.name == 'main-default-collector'"
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneCollector(data.collector.name)"
+ nz-tooltip
+ [nzTooltipTitle]="'collector.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git a/web-app/src/app/routes/setting/status/status.component.html
b/web-app/src/app/routes/setting/status/status.component.html
index 6359d59f2..5a31a33a0 100644
--- a/web-app/src/app/routes/setting/status/status.component.html
+++ b/web-app/src/app/routes/setting/status/status.component.html
@@ -202,25 +202,27 @@
</td>
<td nzAlign="center">{{ data.gmtUpdate | date : 'YYYY-MM-dd
HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- nz-button
- nzType="primary"
- (click)="onEditOneComponent(data)"
- nz-tooltip
- [nzTooltipTitle]="'status.component.edit' | i18n"
- >
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzType="primary"
- nzDanger
- (click)="onDeleteOneComponent(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'status.component.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onEditOneComponent(data)"
+ nz-tooltip
+ [nzTooltipTitle]="'status.component.edit' | i18n"
+ >
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneComponent(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'status.component.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
@@ -288,25 +290,27 @@
</td>
<td nzAlign="center">{{ data.startTime | date : 'YYYY-MM-dd
HH:mm:ss' }}</td>
<td nzAlign="center">
- <button
- nz-button
- nzType="primary"
- (click)="onUpdateOneIncident(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'status.incident.update' | i18n"
- >
- <i nz-icon nzType="redo" nzTheme="outline"></i>
- </button>
- <button
- nz-button
- nzType="primary"
- nzDanger
- (click)="onDeleteOneIncident(data.id)"
- nz-tooltip
- [nzTooltipTitle]="'status.incident.delete' | i18n"
- >
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="onUpdateOneIncident(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'status.incident.update' | i18n"
+ >
+ <i nz-icon nzType="redo" nzTheme="outline"></i>
+ </button>
+ <button
+ nz-button
+ nzType="primary"
+ nzDanger
+ (click)="onDeleteOneIncident(data.id)"
+ nz-tooltip
+ [nzTooltipTitle]="'status.incident.delete' | i18n"
+ >
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git a/web-app/src/app/routes/setting/tags/tags.component.html
b/web-app/src/app/routes/setting/tags/tags.component.html
index 5efdc5121..84d8c5e39 100644
--- a/web-app/src/app/routes/setting/tags/tags.component.html
+++ b/web-app/src/app/routes/setting/tags/tags.component.html
@@ -99,12 +99,14 @@
<td nzAlign="center">{{ data.description }}</td>
<td nzAlign="center">{{ data.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss'
}}</td>
<td nzAlign="center">
- <button nz-button nzType="primary" (click)="onEditOneTag(data)"
nz-tooltip [nzTooltipTitle]="'tag.edit' | i18n">
- <i nz-icon nzType="edit" nzTheme="outline"></i>
- </button>
- <button nz-button nzType="primary" nzDanger
(click)="onDeleteOneTag(data.id)" nz-tooltip [nzTooltipTitle]="'tag.delete' |
i18n">
- <i nz-icon nzType="delete" nzTheme="outline"></i>
- </button>
+ <div class="actions">
+ <button nz-button nzType="primary" (click)="onEditOneTag(data)"
nz-tooltip [nzTooltipTitle]="'tag.edit' | i18n">
+ <i nz-icon nzType="edit" nzTheme="outline"></i>
+ </button>
+ <button nz-button nzType="primary" nzDanger
(click)="onDeleteOneTag(data.id)" nz-tooltip [nzTooltipTitle]="'tag.delete' |
i18n">
+ <i nz-icon nzType="delete" nzTheme="outline"></i>
+ </button>
+ </div>
</td>
</tr>
</tbody>
diff --git a/web-app/src/styles/theme.less b/web-app/src/styles/theme.less
index 01c5b74a1..dd773ad1e 100644
--- a/web-app/src/styles/theme.less
+++ b/web-app/src/styles/theme.less
@@ -105,3 +105,9 @@
.content_bg_color {
background-color: white;
}
+
+.actions {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
