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

trnaslations view + button remove

parent 3494be5e
No related branches found
No related tags found
1 merge request!192Resolve "Improve new layout"
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 46 deletions
src/app/appmarket/admin/configuration/details/configurationdetails.component.css
+ 1
− 1
View file @ 93dcc233
......@@ -19,7 +19,7 @@
.email-row {
display: flex;
flex-direction: row;
justify-content: space-between;
}
.pd-top-7 {
......
src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+ 3
− 3
View file @ 93dcc233
......@@ -68,11 +68,11 @@
[(ngModel)]="configuration.appInstanceFailureEmailList[i]"/>
</div>
<button role="button" type="button" class="btn btn-danger" (click)="removeEmailEntry(email)">
Remove
<button role="button" type="button" class="btn btn-danger-text" (click)="removeEmailEntry(email)">
<i class="pi pi-trash" style="font-size: 15px;"></i>
</button>
</div>
<div class="pd-left-15">
<div class="">
<button role="button" type="button" class="btn btn-secondary" (click)="addEmailEntry()">Add
</button>
</div>
......
src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.css
+ 4
− 1
View file @ 93dcc233
......@@ -7,4 +7,7 @@ h3{
padding-top: 15px;
margin-bottom: 0;
padding-bottom: 0;
}
\ No newline at end of file
}
:host .table-striped>tbody>tr:nth-of-type(odd){
background: transparent;
}
src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html
+ 3
− 6
View file @ 93dcc233
<h1></h1>
<h2 *ngIf="language"><img alt="language" src="assets/images/country/{{language.language}}_circle.png" style="height: 32px;"> {{'LANGUAGE.' + language.language.toUpperCase() + '_LABEL' | translate}}</h2>
<label for="advanced-switch">{{switchLabel}}</label>
<br>
<p-inputSwitch [(ngModel)]="advanced" id="advanced-switch" name="advanced-switch" (onChange)="handleLabel()"></p-inputSwitch>
<div *ngIf="language && !advanced">
<h3>{{ 'LANGUAGE_MANAGEMENT.LABELS_TRANSLATION' | translate }}</h3>
<hr>
<div *ngFor="let key of keys; let ix=index">
<div class="panel panel-default">
<div class=" background-section" style="padding: 10px">
<div class="panel-heading" (click)="hide[ix]=!hide[ix]">{{key.toString()}}</div>
<table class="table table-striped" *ngIf="!hide[ix]" aria-describedby="Language values table">
<thead>
......@@ -64,9 +62,8 @@
</div>
</div>
<h3>{{ 'LANGUAGE_MANAGEMENT.MAILS_TRANSLATION' | translate }}</h3>
<hr>
<div *ngFor="let template of mailTemplates; let ix=index">
<div class="panel panel-default">
<div class=" background-section" style="padding: 10px">
<div class="panel-heading" (click)="hideMails[ix]=!hideMails[ix]">{{template.mailType}}</div>
<div class="panel-body" *ngIf="!hideMails[ix]">
<label for="subject-textarea">{{'LANGUAGE_MANAGEMENT.SUBJECT_LABEL' | translate}}</label>
......@@ -92,7 +89,7 @@
</div>
<div *ngIf="language && advanced">
<div class="panel panel-default">
<div class=" background-section" style="padding: 10px">
<div class="panel-heading">{{'LANGUAGE_MANAGEMENT.LABELS_TRANSLATION' | translate }}</div>
<div class="panel-body">
<textarea style="width:100%;" class="form-control" [rows]="50" [(ngModel)]="language.content" name="content-textarea"></textarea>
......
src/app/appmarket/domains/domain-group-view/domain-group-view.component.css
+ 3
− 1
View file @ 93dcc233
......@@ -80,5 +80,7 @@ input.ng-dirty.ng-invalid {
.margin-right {
margin-right: 2rem;
}
td{
vertical-align: middle;
}
src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
+ 27
− 25
View file @ 93dcc233
......@@ -39,21 +39,17 @@
<h4 style="font-size:15px; font-weight: bold">
{{ 'DOMAINS.GROUP.ACCESS_USER' | translate }}
</h4>
<div *roles="['ROLE_SYSTEM_ADMIN']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-text" (click)="showModalUser()">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
</div>
<div *roles="['ROLE_VL_MANAGER']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-warning" (click)="removeMyAccess()">{{'DOMAINS.GROUP.DELETE_MYSELF' | translate}}</button>
<div style="display: flex; gap:10px;">
<div *roles="['ROLE_SYSTEM_ADMIN']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-text" (click)="showModalUser()">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
</div>
<div *roles="['ROLE_VL_MANAGER']" style="display: flex; justify-content: end;">
<button type="button" class="btn btn-danger" (click)="removeMyAccess()">{{'DOMAINS.GROUP.DELETE_MYSELF' | translate}}</button>
</div>
</div>
</div>
</div>
<div class="panel-body">
<div *roles="['ROLE_SYSTEM_ADMIN']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-secondary" (click)="showModalUser()">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
</div>
<div *roles="['ROLE_GROUP_MANAGER']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-warning" (click)="removeMyAccess()">{{'DOMAINS.GROUP.DELETE_MYSELF' | translate}}</button>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domains in Group table" style="margin-top: 2rem">
<thead>
<tr>
......@@ -65,9 +61,12 @@
<tr class="table-row">
<td style="width: 40%" >{{user.username}}</td>
<td style="width: 40%" >{{user.firstname}} {{user.lastname}}</td>
<td class="flex justify-content-end">
<div class="flex">
<button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-danger" (click)="deleteUserAccess(user)">{{'DOMAINS.GROUP.DELETE_USER' | translate}}</button>
<td style="text-align:end">
<div class="">
<button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-danger-text" (click)="deleteUserAccess(user)">
<i class="pi pi-trash" style="font-size: 15px;"></i>
<!-- {{'DOMAINS.GROUP.DELETE_USER' | translate}}-->
</button>
</div>
</td>
......@@ -80,18 +79,18 @@
</div>
<div *ngIf="!this.addingMode" class="panel panel-default" style="margin-top: 3rem">
<div *ngIf="!this.addingMode" class="background-section " style="margin-top: 3rem">
<div class="panel-heading">
<div style="display: flex; justify-content: space-between; align-items: center">
<div>
<div style="display: flex; justify-content: space-between; align-items: center" >
<h4 style="font-size:15px; font-weight: bold">
{{ 'DOMAINS.LIST.LIST' | translate }}
</div>
</h4>
<button class="btn pull-right toggle-button" data-toggle="collapse" [attr.data-target]="'#domains-list'" type="button" aria-expanded="false"> </button>
</div>
</div>
<div class="panel-body collapse" id="domains-list">
<div style="display: flex; justify-content: end">
<button type="button" class="btn btn-secondary" (click)="showModal()">{{'DOMAINS.LIST.ADD' | translate}}</button>
<button type="button" class="btn btn-text" (click)="showModal()">{{'DOMAINS.LIST.ADD' | translate}}</button>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domains in Group table" style="margin-top: 2rem">
<thead>
......@@ -104,8 +103,11 @@
<tr class="table-row">
<td style="width: 40%" >{{domain.name}}</td>
<td style="width: 40%" >{{domain.codename}}</td>
<td class="flex justify-content-end">
<button type="button" class="btn btn-danger" (click)="deleteDomainFromGroup(domain)">{{'DOMAINS.LIST.DELETE' | translate}}</button>
<td style="text-align: end">
<button type="button" class="btn btn-danger-text" (click)="deleteDomainFromGroup(domain)">
<i class="pi pi-trash" style="font-size: 15px;"></i>
<!-- {{'DOMAINS.LIST.DELETE' | translate}}-->
</button>
</td>
</tr>
</ng-template>
......@@ -114,20 +116,20 @@
</div>
</div>
<div *ngIf="!this.addingMode" class="panel panel-default" style="margin-top: 3rem">
<div *ngIf="!this.addingMode" class="background-section" style="margin-top: 3rem">
<div class="panel-heading">
<div style="display: flex; justify-content: space-between; align-items: center">
<div>
<h4 style="font-size:15px; font-weight: bold">
{{ 'DOMAIN_DETAILS.APP_STATUS' | translate }}
</div>
</h4>
<button class="btn pull-right toggle-button" data-toggle="collapse" [attr.data-target]="'#app-status'" type="button" aria-expanded="false"> </button>
</div>
</div>
<div class="panel-body collapse" id="app-status" >
<div style="display: flex; justify-content: end; margin-bottom: 2rem">
<button class="btn btn-secondary" type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
<button class="btn btn-text" type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domain details table">
<thead>
......
src/app/shared/left-menu/left-menu.component.html
+ 1
− 1
View file @ 93dcc233
......@@ -151,7 +151,7 @@
</span>
</a>
</li>
<li *roles="['ROLE_SYSTEM_ADMIN']" (click)="showNotificationModal()" [ngClass]="{'collapsed': isCollapsed}">
<li *roles="['ROLE_SYSTEM_ADMIN']" (click)="showNotificationModal()" [ngClass]="{'collapsed': isCollapsed}" style="cursor:pointer">
<i class="pi pi-send" style="margin-right:10px; font-size: 18px" title="{{ 'NAVBAR.ALL_USERS' | translate }}"></i>
<span *ngIf="!isCollapsed">{{ 'NAVBAR.ALL_USERS' | translate }}</span>
</li>
......
src/app/shared/users/privileges/userprivileges.component.html
+ 10
− 7
View file @ 93dcc233
<div style="padding-bottom: 15px;" class="background-section">
<h4 style="font-size:15px; font-weight: bold" >{{'USER_PRIVILEGES.HEADER' | translate}}</h4>
<div class="panel-body">
<div *ngIf="isModeAllowed(ComponentMode.CREATE) && user != null && user.username !== authService.getUsername()"> <!-- user should not be able to change his roles -->
<div style="margin-bottom: 3rem" *ngIf="isModeAllowed(ComponentMode.CREATE) && user != null && user.username !== authService.getUsername()"> <!-- user should not be able to change his roles -->
<form *ngIf="user" [formGroup]="newPrivilegeForm" (submit)="add()" class="form-inline row">
<div *ngIf="domainId" class="form-group col-lg-3">
<label for="domainId">{{'USER_PRIVILEGES.DOMAIN' | translate}}:</label>
<div *ngIf="domainId" class="form-group col-lg-3" >
<label style="margin-right:10px" for="domainId" >{{'USER_PRIVILEGES.DOMAIN' | translate}}:</label>
<select class="form-control" [formGroup]="newPrivilegeForm"
id="domainId" name="domainId" formControlName="domainId" style="min-width: 170px"
[attr.disabled]="domainId!==domainService.getGlobalDomainId()? '' : null"
......@@ -14,7 +14,7 @@
</div>
<div class="form-group col-lg-3">
<label for="role" >{{'USER_PRIVILEGES.ROLE' | translate}}:</label>
<label style="margin-right:10px" for="role" >{{'USER_PRIVILEGES.ROLE' | translate}}:</label>
<select
class="form-control" [formGroup]="newPrivilegeForm" id="role"
name="role" formControlName="role" style="min-width: 170px">
......@@ -27,7 +27,7 @@
<button type="submit" class="btn btn-primary">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
</div>
</form>
<hr>
</div>
<div *ngIf="isOnlyGuestInGlobalDomain()">
......@@ -51,8 +51,11 @@
<td>{{userrole.domainName}}</td>
<td>{{"ENUM.USER_ROLES." + userrole.role.toUpperCase() | translate}}</td>
<td *ngIf="!isInMode(ComponentMode.PROFILVIEW) && authService.hasRole('ROLE_SYSTEM_ADMIN') && user?.username !== authService.getUsername()" class="text-right">
<button type="button" class="btn btn-danger"
(click)="remove(user.id, userrole.role, userrole.domainId)">{{'USER_PRIVILEGES.REMOVE_BUTTON' | translate}}</button>
<button type="button" class="btn btn-danger-text"
(click)="remove(user.id, userrole.role, userrole.domainId)">
<i class="pi pi-trash" style="font-size: 15px;"></i>
<!-- {{'USER_PRIVILEGES.REMOVE_BUTTON' | translate}}-->
</button>
</td>
</tr>
</ng-template>
......
src/styles.css
+ 12
− 1
View file @ 93dcc233
......@@ -161,6 +161,14 @@
.btn-danger{
background: var(--danger-button-color);
}
.btn-danger-text{
color: var(--danger-text-button-color);
background: transparent;
}
.btn-danger-text:hover{
color: var(--danger-button-hover);
background: var(--danger-text-button-background-hover);
}
.btn-text{
color: var(--primary-text-button-color);
background: transparent;
......@@ -245,4 +253,7 @@ body .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon{
.grecaptcha-badge {
visibility: hidden;
bottom: 45px !important;
}
\ No newline at end of file
}
body .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
vertical-align: middle;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment