Skip to content

Commit

Permalink
changed layout
Browse files Browse the repository at this point in the history
  • Loading branch information
ck-c8y committed Dec 31, 2024
1 parent d9f0dd9 commit 149f11f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,13 @@

<c8y-title>Configuration</c8y-title>
<c8y-action-bar-item [placement]="'right'">
<button
class="btn btn-link"
title="{{ 'Add connector' | translate }}"
(click)="onConfigurationAdd()"
>
<button class="btn btn-link" title="{{ 'Add connector' | translate }}" (click)="onConfigurationAdd()">
<i c8yIcon="connected"></i>
{{ 'Add connector' | translate }}
</button>
</c8y-action-bar-item>
<c8y-action-bar-item [placement]="'right'">
<button
class="btn btn-link"
title="{{ 'Refresh' | translate }}"
(click)="refresh()"
>
<button class="btn btn-link" title="{{ 'Refresh' | translate }}" (click)="refresh()">
<i c8yIcon="refresh"></i>
{{ 'Refresh' | translate }}
</button>
Expand All @@ -44,11 +36,12 @@
<div class="card card--fullpage">
<div class="col-lg-12">
<div class="card-block">
<d11r-mapping-connector-configuration
#connectorConfigurationBroker
[selectable]="false"
></d11r-mapping-connector-configuration>
<d11r-mapping-connector-configuration #connectorConfigurationBroker
[selectable]="false"></d11r-mapping-connector-configuration>
</div>
</div>
</div>
<d11r-mapping-connector-log></d11r-mapping-connector-log>

<div class="elevation-sm">
<d11r-mapping-connector-log></d11r-mapping-connector-log>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
~ @authors Christof Strack
-->

<c8y-data-grid #connectorGrid [title]="'Connector'" [selectable]="selectable && !readOnly" [columns]="columns"
<c8y-data-grid #connectorGrid [title]="'Connectors'" [selectable]="selectable && !readOnly" [columns]="columns"
[selectionPrimaryKey]="'identifier'" [rows]="configurations$ | async" [pagination]="pagination"
[actionControls]="actionControls" (itemsSelect)="onSelectionChanged($event)">
<c8y-ui-empty-state [icon]="'c8y-icon dlt-c8y-icon-connected'" [title]="'No connectors exist.' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
~ @authors Christof Strack
-->

<div>
<div class="legend form-block col-lg-12">Connector Logs</div>
<div class="p-l-24">
<div class="p-24">
<div>
<c8y-form-group>
<form class="form-inline">
<div class="c8y-select-wrapper button-bottom-margin">
<label class="control-label m-r-8" title="{{ 'Filter connector logs' | translate }}">Filter connector logs</label>
<div class="c8y-select-wrapper">
<select class="form-control" style="width: 280px" [(ngModel)]="filterStatusLog.type" name="type">
<ng-container *ngFor="let lt of LoggingEventTypeMap | keyvalue">
<option [ngValue]="lt.key"
<option [ngValue]="lt.key"
*ngIf="lt.value['component'] == 'd11r_connector' || lt.value['component'] == LoggingEventTypeMap[LoggingEventType.ALL].component">
{{ lt.key | formatStringAsWords }}
</option>
</ng-container>
</select>
</div>
<div class="c8y-select-wrapper button-bottom-margin m-l-16">
<div class="c8y-select-wrapper m-l-16">
<select class="form-control" style="width: 180px" [(ngModel)]="filterStatusLog.connectorIdentifier"
name="connectorIdentifier">
<option [value]="'ALL'">ALL connectors</option>
Expand All @@ -44,7 +44,7 @@
</option>
</select>
</div>
<button type="submit" (click)="updateStatusLogs()" class="btn btn-default btn-sm m-b-8 m-l-16">
<button type="submit" (click)="updateStatusLogs()" class="btn btn-default btn-sm m-l-16">
Update
</button>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ import {
ConnectorConfiguration,
ConnectorSpecification,
ConnectorStatus,
Feature,
LoggingEventType,
LoggingEventTypeMap,
SharedService,
} from '..';
import { ConnectorStatusService } from '../service/connector-status.service';
import { ConnectorConfigurationService } from '../service/connector-configuration.service';
Expand Down

0 comments on commit 149f11f

Please sign in to comment.