inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1784] - [Mobile] - Empty folder image should not display drag an… (#2600)

Browse Source 
* [ADF-1784] - [Mobile] - Empty folder image should not display drag and drop image

Fixed

* [ADF-1784] - [Mobile] Empty folder image should not display drag and drop image

Also, for process-lis-component, i added a small fix for the image size when viewed with small screen devices
This commit is contained in:
mihai sirghe
2017-11-03 15:06:54 +02:00
committed by Eugenio Romano
parent 5f95e5f7b2
commit c74b696a6e
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ng2-components/ng2-activiti-processlist/index.ts
View File

@@ -16,6 +16,7 @@
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { import {
MatButtonModule, MatButtonModule,
MatCardModule, MatCardModule,
@@ -127,7 +128,8 @@ export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
MatCardModule, MatCardModule,
MatInputModule, MatInputModule,
MatChipsModule, MatChipsModule,
MatSelectModule MatSelectModule,
FlexLayoutModule
], ],
declarations: [ declarations: [
...ACTIVITI_PROCESSLIST_DIRECTIVES ...ACTIVITI_PROCESSLIST_DIRECTIVES

4
ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
View File

@@ -4,8 +4,8 @@
<adf-empty-list *ngIf="isEmpty()"> <adf-empty-list *ngIf="isEmpty()">
<div adf-empty-list-header class="adf-empty-list-header"> {{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER' | translate}} </div> <div adf-empty-list-header class="adf-empty-list-header"> {{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER' | translate}} </div>
<div adf-empty-list-body *ngIf="!isDisabled()"> <div adf-empty-list-body *ngIf="!isDisabled()">
<div class="adf-empty-list-drag_drop">{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}</div> <div fxHide.lt-md="true" class="adf-empty-list-drag_drop">{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}</div>
<div class="adf-empty-list__any-files-here-to-add"> {{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}} </div> <div fxHide.lt-md="true" class="adf-empty-list__any-files-here-to-add"> {{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}} </div>
</div> </div>
<div adf-empty-list-footer *ngIf="!isDisabled()"> <div adf-empty-list-footer *ngIf="!isDisabled()">
<img class="adf-empty-list__empty_doc_lib" [src]="emptyListImageUrl"> <img class="adf-empty-list__empty_doc_lib" [src]="emptyListImageUrl">

6
ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss
View File

@@ -1,3 +1,5 @@
@import '~@angular/material/theming';
adf-datatable ::ng-deep th span { adf-datatable ::ng-deep th span {
color: #232323; color: #232323;
} }
@@ -45,4 +47,8 @@ adf-datatable ::ng-deep .data-cell {
height: 161px; height: 161px;
object-fit: contain; object-fit: contain;
margin-top: 17px; margin-top: 17px;
@media screen and ($mat-xsmall) {
width: 250px;
}
} }

4
ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html
View File

@@ -3,8 +3,8 @@
<adf-empty-list *ngIf="isEmpty()"> <adf-empty-list *ngIf="isEmpty()">
<div adf-empty-list-header class="adf-empty-list-header"> {{'ADF_TASK_LIST.ATTACHMENT.EMPTY.HEADER' | translate}} </div> <div adf-empty-list-header class="adf-empty-list-header"> {{'ADF_TASK_LIST.ATTACHMENT.EMPTY.HEADER' | translate}} </div>
<div adf-empty-list-body *ngIf="!isDisabled()"> <div adf-empty-list-body *ngIf="!isDisabled()">
<div class="adf-empty-list-drag_drop">{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}</div> <div fxHide.lt-md="true" class="adf-empty-list-drag_drop">{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}</div>
<div class="adf-empty-list__any-files-here-to-add"> {{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}} </div> <div fxHide.lt-md="true" class="adf-empty-list__any-files-here-to-add"> {{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}} </div>
</div> </div>
<div adf-empty-list-footer *ngIf="!isDisabled()"> <div adf-empty-list-footer *ngIf="!isDisabled()">
<img class="adf-empty-list__empty_doc_lib" [src]="emptyListImageUrl"> <img class="adf-empty-list__empty_doc_lib" [src]="emptyListImageUrl">