mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-06-30 18:15:11 +00:00
[ADF-5563][ADF-5565][ADF-5566]Removed !important from 'task-form','cloud-form-demo' and 'add-permission-panel' component (#9187)
* Removed important * ADF-5563 * ADF-5566 * refactored * Refactored * Review comments resolved * [ci:force] * lint issue fixed * lint issues fixed * Refactored * extra space removed * linting resolved * checkbox issue fixed * lint issue fixed * lint issue fixed
This commit is contained in:
parent
d4d731b275
commit
4ff46642fb
@ -27,7 +27,7 @@
|
||||
}
|
||||
|
||||
.app-form-config-editor {
|
||||
height: 500px !important;
|
||||
height: 500px;
|
||||
}
|
||||
|
||||
.app-form-editor-buttons {
|
||||
|
@ -1,75 +1,79 @@
|
||||
<mat-form-field floatPlaceholder="never"
|
||||
class="adf-permission-search-input">
|
||||
<input matInput
|
||||
<mat-form-field floatPlaceholder="never" class="adf-permission-search-input">
|
||||
<input
|
||||
matInput
|
||||
id="searchInput"
|
||||
[formControl]="searchInput"
|
||||
type="text"
|
||||
title="{{'PERMISSION_MANAGER.ADD-PERMISSION.SEARCH' | translate}}"
|
||||
placeholder="{{'PERMISSION_MANAGER.ADD-PERMISSION.SEARCH' | translate}}"
|
||||
[value]="searchedWord">
|
||||
title="{{ 'PERMISSION_MANAGER.ADD-PERMISSION.SEARCH' | translate }}"
|
||||
placeholder="{{ 'PERMISSION_MANAGER.ADD-PERMISSION.SEARCH' | translate }}"
|
||||
[value]="searchedWord"
|
||||
/>
|
||||
|
||||
<mat-icon *ngIf="searchedWord?.length > 0"
|
||||
<mat-icon
|
||||
*ngIf="searchedWord?.length > 0"
|
||||
class="adf-permission-search-icon"
|
||||
data-automation-id="adf-permission-clear-input"
|
||||
id="adf-permission-clear-input"
|
||||
matSuffix
|
||||
(click)="clearSearch()">clear
|
||||
(click)="clearSearch()"
|
||||
>clear
|
||||
</mat-icon>
|
||||
|
||||
<mat-icon *ngIf="searchedWord?.length === 0"
|
||||
class="adf-permission-search-icon"
|
||||
data-automation-id="adf-permission-search-icon"
|
||||
matSuffix>search
|
||||
<mat-icon *ngIf="searchedWord?.length === 0" class="adf-permission-search-icon" data-automation-id="adf-permission-search-icon" matSuffix
|
||||
>search
|
||||
</mat-icon>
|
||||
</mat-form-field>
|
||||
|
||||
<div *ngIf="searchedWord?.length === 0"
|
||||
class="adf-permission-start-message"
|
||||
id="adf-add-permission-type-search">
|
||||
<span>{{'PERMISSION_MANAGER.ADD-PERMISSION.TYPE-MESSAGE' | translate}}</span>
|
||||
<div *ngIf="searchedWord?.length === 0" class="adf-permission-start-message" id="adf-add-permission-type-search">
|
||||
<span>{{ 'PERMISSION_MANAGER.ADD-PERMISSION.TYPE-MESSAGE' | translate }}</span>
|
||||
</div>
|
||||
|
||||
<adf-search #search
|
||||
<adf-search
|
||||
#search
|
||||
[searchTerm]="searchedWord"
|
||||
id="adf-add-permission-authority-results"
|
||||
class="adf-permission-result-list"
|
||||
[class.adf-permission-result-list-search]="searchedWord.length === 0">
|
||||
[class.adf-permission-result-list-search]="searchedWord.length === 0"
|
||||
>
|
||||
<ng-template let-data>
|
||||
<mat-selection-list class="adf-permission-result-list-elements"
|
||||
title="{{'PERMISSION_MANAGER.ADD-PERMISSION.USER-GROUP-LIST' | translate}}"
|
||||
(selectionChange)="onSelectionChange()">
|
||||
<mat-list-option id="adf-add-permission-group-everyone"
|
||||
class="adf-list-option-item"
|
||||
#eveyone
|
||||
[disableRipple]="true"
|
||||
[value]="EVERYONE">
|
||||
<mat-selection-list
|
||||
class="adf-permission-result-list-elements"
|
||||
title="{{ 'PERMISSION_MANAGER.ADD-PERMISSION.USER-GROUP-LIST' | translate }}"
|
||||
(selectionChange)="onSelectionChange()"
|
||||
>
|
||||
<mat-list-option id="adf-add-permission-group-everyone" #eveyone [disableRipple]="true" [value]="EVERYONE">
|
||||
<div class="adf-list-option-item">
|
||||
<adf-user-icon-column [node]="EVERYONE" id="add-group-icon" [selected]="eveyone.selected"></adf-user-icon-column>
|
||||
<p class="adf-result-name">
|
||||
{{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
|
||||
{{ 'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate }}
|
||||
</p>
|
||||
</div>
|
||||
</mat-list-option>
|
||||
|
||||
<mat-list-option *ngFor="let item of data?.list?.entries; let idx = index"
|
||||
<mat-list-option
|
||||
*ngFor="let item of data?.list?.entries; let idx = index"
|
||||
[disableRipple]="true"
|
||||
[value]="item"
|
||||
class="adf-list-option-item"
|
||||
id="result_option_{{idx}}"
|
||||
#option>
|
||||
id="result_option_{{ idx }}"
|
||||
#option
|
||||
>
|
||||
<div class="adf-list-option-item">
|
||||
<adf-user-icon-column [node]="item" [selected]="option.selected"></adf-user-icon-column>
|
||||
<p class="adf-result-name">
|
||||
<ng-container *ngIf="item.entry?.properties['cm:authorityDisplayName']; else authorityName">
|
||||
{{item.entry.properties['cm:authorityDisplayName']}}
|
||||
{{ item.entry.properties['cm:authorityDisplayName'] }}
|
||||
</ng-container>
|
||||
<ng-template #authorityName>
|
||||
<ng-container *ngIf="item.entry?.properties['cm:authorityName']; else owner">
|
||||
{{item.entry.properties['cm:authorityName']}}
|
||||
{{ item.entry.properties['cm:authorityName'] }}
|
||||
</ng-container>
|
||||
</ng-template>
|
||||
<ng-template #owner>
|
||||
{{item.entry?.properties['cm:firstName'] ? item.entry?.properties['cm:firstName'] : '' }}
|
||||
{{item.entry?.properties['cm:lastName'] ? item.entry?.properties['cm:lastName']: ''}}
|
||||
{{ item.entry?.properties['cm:firstName'] ? item.entry?.properties['cm:firstName'] : '' }}
|
||||
{{ item.entry?.properties['cm:lastName'] ? item.entry?.properties['cm:lastName'] : '' }}
|
||||
</ng-template>
|
||||
</p>
|
||||
</div>
|
||||
</mat-list-option>
|
||||
</mat-selection-list>
|
||||
</ng-template>
|
||||
|
@ -7,6 +7,10 @@ $search-result-height: calc(100% - 75px);
|
||||
overflow: auto;
|
||||
border: 2px solid var(--adf-theme-foreground-text-color-007);
|
||||
|
||||
mat-pseudo-checkbox {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&-elements {
|
||||
width: 100%;
|
||||
}
|
||||
@ -16,6 +20,16 @@ $search-result-height: calc(100% - 75px);
|
||||
}
|
||||
}
|
||||
|
||||
&-list-option-item {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
|
||||
.adf-result-name {
|
||||
padding-left: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
&-permission-start-message {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -47,22 +61,6 @@ $search-result-height: calc(100% - 75px);
|
||||
}
|
||||
}
|
||||
|
||||
&-list-option-item {
|
||||
mat-pseudo-checkbox {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.mat-list-text {
|
||||
display: flex;
|
||||
flex-direction: row !important;
|
||||
align-items: center;
|
||||
|
||||
.adf-result-name {
|
||||
padding-left: 16px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&-permission-action {
|
||||
&[disabled] {
|
||||
opacity: 0.6;
|
||||
|
@ -59,7 +59,8 @@
|
||||
</adf-empty-content>
|
||||
</ng-template>
|
||||
</mat-card-content>
|
||||
<mat-card-actions class="adf-task-form-actions">
|
||||
<mat-card-actions>
|
||||
<div class="adf-task-form-actions">
|
||||
<ng-template [ngTemplateOutlet]="taskFormButtons"></ng-template>
|
||||
<button mat-button
|
||||
*ngIf="!isCompletedTask()" id="adf-no-form-complete-button"
|
||||
@ -68,6 +69,7 @@
|
||||
(click)="onCompleteTask()">
|
||||
{{'ADF_TASK_FORM.EMPTY_FORM.BUTTONS.COMPLETE' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
</ng-template>
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
&-actions {
|
||||
float: right;
|
||||
padding-bottom: 25px !important;
|
||||
padding-right: 25px !important;
|
||||
padding-right: 25px;
|
||||
padding-bottom: 25px;
|
||||
|
||||
& .mat-button {
|
||||
height: 36px;
|
||||
|
Loading…
x
Reference in New Issue
Block a user