Skip to content
Snippets Groups Projects
Commit 970c3e4b authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

visual fixes

parent 8e458b23
No related branches found
No related tags found
1 merge request!188Resolve "Improve new layout"
Hide whitespace changes
Inline Side-by-side
src/app/appmarket/appdetails/appdetails.component.html
+ 2
− 2
View file @ 970c3e4b
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<div *ngIf="app"> <div *ngIf="app">
<img alt="App logo" [src]="(appImagesService.getAppLogoUrl(appId) | secure) || 'assets/images/app-logo-example.png'" height="90px" width="90px"/> <img alt="App logo" [src]="(appImagesService.getAppLogoUrl(appId) | secure) || 'assets/images/app-logo-example.png'" height="90px" width="90px"/>
</div> </div>
<div *ngIf="!app"> <div *ngIf="!app" style="height:90px; align-content:center;">
<img alt="App logo" src="assets/images/app-logo-example.png" height="90px" width="90px"/> <img alt="App logo" src="assets/images/app-logo-example.png" width="90px"/>
</div> </div>
<h3 style="margin:0 20px;">{{app?.name}}</h3> <h3 style="margin:0 20px;">{{app?.name}}</h3>
</div> </div>
......
src/app/appmarket/domains/domain/domain.component.css
+ 9
− 0
View file @ 970c3e4b
...@@ -60,3 +60,12 @@ input.ng-dirty.ng-invalid { ...@@ -60,3 +60,12 @@ input.ng-dirty.ng-invalid {
border:none; border:none;
box-shadow: none; box-shadow: none;
} }
.form-control[disabled],
fieldset[disabled] .form-control {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
background: transparent;
border:none;
box-shadow: none;
}
src/app/appmarket/domains/domain/domain.component.html
+ 23
− 18
View file @ 970c3e4b
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="form-group" *ngIf="!isInMode(ComponentMode.CREATE) && (authService.hasRole('ROLE_SYSTEM_ADMIN') || authService.hasRole('ROLE_OPERATOR'))"> <div class="form-group" *ngIf="!isInMode(ComponentMode.CREATE) && (authService.hasRole('ROLE_SYSTEM_ADMIN') || authService.hasRole('ROLE_OPERATOR'))">
<label class="col-sm-2 control-label">{{ 'DOMAIN_DETAILS.ID_IN_DB' | translate }}</label> <label class="col-sm-2 control-label">{{ 'DOMAIN_DETAILS.ID_IN_DB' | translate }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static">{{domain.id}}</p> <p class="form-control-static" style="padding: 6px 12px">{{domain.id}}</p>
</div> </div>
</div> </div>
<hr/> <hr/>
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<div class="form-group" *ngIf="domain?.id !== domainService.getGlobalDomainId() && isInMode(ComponentMode.VIEW) && isManual()"> <div class="form-group" *ngIf="domain?.id !== domainService.getGlobalDomainId() && isInMode(ComponentMode.VIEW) && isManual()">
<label class="col-sm-2 control-label text-right" for="configured-status">{{ 'DOMAIN_DETAILS.DCN_STATUS' | translate }}</label> <label class="col-sm-2 control-label text-right" for="configured-status">{{ 'DOMAIN_DETAILS.DCN_STATUS' | translate }}</label>
<div class="col-sm-10" id="configured-status" style="padding-top: 6px;"> <div class="col-sm-10" id="configured-status" style="padding-top: 6px;">
<p *ngIf="domain?.domainDcnDetails?.dcnConfigured">{{ 'DOMAIN_DETAILS.CONFIGURED_VIEW' | translate }}</p> <p style="padding: 2px 12px" *ngIf="domain?.domainDcnDetails?.dcnConfigured">{{ 'DOMAIN_DETAILS.CONFIGURED_VIEW' | translate }}</p>
<p *ngIf="!domain?.domainDcnDetails?.dcnConfigured">{{ 'DOMAIN_DETAILS.NOT_CONFIGURED_VIEW' | translate }}</p> <p style="padding: 2px 12px" *ngIf="!domain?.domainDcnDetails?.dcnConfigured">{{ 'DOMAIN_DETAILS.NOT_CONFIGURED_VIEW' | translate }}</p>
</div> </div>
</div> </div>
...@@ -104,11 +104,11 @@ ...@@ -104,11 +104,11 @@
</div> </div>
<div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')"> <div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')">
<h4 style="font-size:15px; font-weight: bold">{{ 'DOMAIN_DETAILS.DOMAIN_USERS' | translate }}</h4> <h4 style="font-size:15px; font-weight: bold">{{ 'DOMAIN_DETAILS.DOMAIN_USERS' | translate }}</h4>
<div class="panel-body"> <div class="panel-body">
<table class="table table-hover table-condensed" aria-describedby="Domains details table"> <table *ngIf="domainUsers.length !== 0" class="table table-hover table-condensed" aria-describedby="Domains details table">
<thead> <thead >
<tr> <tr>
<th scope="col" *roles="['ROLE_SYSTEM_ADMIN']">{{ 'DOMAIN_DETAILS.ID' | translate }}</th> <th scope="col" *roles="['ROLE_SYSTEM_ADMIN']">{{ 'DOMAIN_DETAILS.ID' | translate }}</th>
<th scope="col">{{ 'DOMAIN_DETAILS.USER_NAME' | translate }}</th> <th scope="col">{{ 'DOMAIN_DETAILS.USER_NAME' | translate }}</th>
...@@ -120,9 +120,6 @@ ...@@ -120,9 +120,6 @@
</thead> </thead>
<tbody> <tbody>
<tr *ngIf="domainUsers.length === 0" >
<td colspan="6" style="text-align: center">None</td>
</tr>
<ng-template ngFor let-user [ngForOf]="domainUsers"> <ng-template ngFor let-user [ngForOf]="domainUsers">
<tr> <tr>
<td *ngIf="authService.hasRole('ROLE_SYSTEM_ADMIN')">{{user.id}}</td> <td *ngIf="authService.hasRole('ROLE_SYSTEM_ADMIN')">{{user.id}}</td>
...@@ -145,6 +142,11 @@ ...@@ -145,6 +142,11 @@
</tbody> </tbody>
</table> </table>
<div>
<tr *ngIf="domainUsers.length === 0" >
<td >None</td>
</tr>
</div>
</div> </div>
</div> </div>
...@@ -242,7 +244,7 @@ ...@@ -242,7 +244,7 @@
<div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')"> <div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')">
<h4 style="font-size:15px; font-weight: bold">{{ 'DOMAINS.LIST.GROUP' | translate }}</h4> <h4 style="font-size:15px; font-weight: bold">{{ 'DOMAINS.LIST.GROUP' | translate }}</h4>
<div class="panel-body"> <div class="panel-body">
<table class="table table-hover table-condensed" aria-describedby="Domain group list"> <table *ngIf="domain.groups.length !== 0" class="table table-hover table-condensed" aria-describedby="Domain group list">
<thead> <thead>
<tr> <tr>
<th scope="col">{{ 'DOMAINS.LIST.DOMAIN_NAME' | translate }}</th> <th scope="col">{{ 'DOMAINS.LIST.DOMAIN_NAME' | translate }}</th>
...@@ -251,9 +253,6 @@ ...@@ -251,9 +253,6 @@
</thead> </thead>
<tbody> <tbody>
<tr *ngIf="domain.groups.length === 0" >
<td colspan="6" style="text-align: center">None</td>
</tr>
<ng-template ngFor let-group [ngForOf]="domain.groups"> <ng-template ngFor let-group [ngForOf]="domain.groups">
<tr> <tr>
<td>{{group.name}}</td> <td>{{group.name}}</td>
...@@ -263,6 +262,9 @@ ...@@ -263,6 +262,9 @@
</tbody> </tbody>
</table> </table>
<div *ngIf="domain.groups.length === 0" >
<p>None</p>
</div>
</div> </div>
</div> </div>
...@@ -270,8 +272,11 @@ ...@@ -270,8 +272,11 @@
<!-- CLUSTER CONFIGURATION READ ONLY PRESENTATION --> <!-- CLUSTER CONFIGURATION READ ONLY PRESENTATION -->
<div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')"> <div class="background-section" *ngIf="isInMode(ComponentMode.VIEW) && !authService.hasRole('ROLE_OPERATOR')">
<h4 style="font-size:15px; font-weight: bold">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4> <h4 style="font-size:15px; font-weight: bold">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4>
<div class="panel-body" *ngIf="domain.clusters.length === 0" >
<p>None</p>
</div>
<div class="form-group" *ngIf="domain.clusters.length >0"> <div class="form-group panel-body" *ngIf="domain.clusters.length >0">
<label for="clusterId" class="col-sm-2 control-label">{{ 'CLUSTERS.ID' | translate }}</label> <label for="clusterId" class="col-sm-2 control-label">{{ 'CLUSTERS.ID' | translate }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" [disabled]="true" id="clusterId " <input type="text" class="form-control" [disabled]="true" id="clusterId "
...@@ -279,7 +284,7 @@ ...@@ -279,7 +284,7 @@
</div> </div>
</div> </div>
<div class="form-group" *ngIf="domain.clusters.length >0"> <div class="form-group panel-body" *ngIf="domain.clusters.length >0">
<label for="clusterName" class="col-sm-2 control-label">{{ 'CLUSTERS.NAME' | translate }}</label> <label for="clusterName" class="col-sm-2 control-label">{{ 'CLUSTERS.NAME' | translate }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" [disabled]="true" id="clusterName " <input type="text" class="form-control" [disabled]="true" id="clusterName "
...@@ -287,7 +292,7 @@ ...@@ -287,7 +292,7 @@
</div> </div>
</div> </div>
<div class="form-group" *ngIf="domain.clusters.length >0"> <div class="form-group panel-body" *ngIf="domain.clusters.length >0">
<label for="clusterCodeName" class="col-sm-2 control-label">{{ 'CLUSTERS.CODENAME' | translate }}</label> <label for="clusterCodeName" class="col-sm-2 control-label">{{ 'CLUSTERS.CODENAME' | translate }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" [disabled]="true" id="clusterCodeName " <input type="text" class="form-control" [disabled]="true" id="clusterCodeName "
...@@ -295,7 +300,7 @@ ...@@ -295,7 +300,7 @@
</div> </div>
</div> </div>
<div class="form-group" *ngIf="domain.clusters.length >0"> <div class="form-group panel-body" *ngIf="domain.clusters.length >0">
<label for="clusterDescription" class="col-sm-2 control-label">{{ 'CLUSTERS.DESCRIPTION' | translate }}</label> <label for="clusterDescription" class="col-sm-2 control-label">{{ 'CLUSTERS.DESCRIPTION' | translate }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" [disabled]="true" id="clusterDescription " <input type="text" class="form-control" [disabled]="true" id="clusterDescription "
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment