From ba1fb96f313732e6d304e4ef6673f94799660a7d Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Wed, 11 May 2016 14:50:55 +0100 Subject: [PATCH] #46 Accessibility --- ng2-components/ng2-alfresco-upload/i18n/en.json | 6 ++++++ ng2-components/ng2-alfresco-upload/i18n/it.json | 8 +++++++- .../src/components/file-uploading-dialog.component.ts | 2 +- .../src/components/file-uploading-list.component.html | 8 ++++++-- .../src/components/file-uploading-list.component.js | 10 +++++++--- .../components/file-uploading-list.component.js.map | 2 +- .../src/components/file-uploading-list.component.ts | 4 +++- .../src/components/upload-button.component.html | 9 ++++++--- .../src/components/upload-button.component.ts | 2 +- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/ng2-components/ng2-alfresco-upload/i18n/en.json b/ng2-components/ng2-alfresco-upload/i18n/en.json index 34fc7ee2a4..06a8fad630 100644 --- a/ng2-components/ng2-alfresco-upload/i18n/en.json +++ b/ng2-components/ng2-alfresco-upload/i18n/en.json @@ -8,6 +8,12 @@ "COMPLETED": "uploads complete", "PROGRESS": "Upload in progress..." }, + "FILE_INFO": { + "NAME": "File name", + "PROGRESS": "File progress", + "SIZE": "File size", + "ACTION": "Actions" + }, "ACTION": { "UNDO": "Undo" } diff --git a/ng2-components/ng2-alfresco-upload/i18n/it.json b/ng2-components/ng2-alfresco-upload/i18n/it.json index 6f15cd3935..6e38ded16c 100644 --- a/ng2-components/ng2-alfresco-upload/i18n/it.json +++ b/ng2-components/ng2-alfresco-upload/i18n/it.json @@ -5,9 +5,15 @@ "UPLOAD_FOLDER": "Carica una cartella" }, "MESSAGES": { - "COMPLETED": "caricamento completato", + "COMPLETED": "caricamenti completati", "PROGRESS": "caricamento in corso..." }, + "FILE_INFO": { + "NAME": "Nome file", + "PROGRESS": "Percentuale caricamento", + "SIZE": "Dimensione file", + "ACTION": "Azioni" + }, "ACTION": { "UNDO": "Annulla" } diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index 4352e56559..b03f998331 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -19,7 +19,7 @@ import {Component, ElementRef, Input} from 'angular2/core'; import {FileModel} from '../models/file.model'; import {FileUploadingListComponent} from './file-uploading-list.component'; -import {TranslateService, TranslatePipe} from 'ng2-translate/ng2-translate'; +import {TranslatePipe} from 'ng2-translate/ng2-translate'; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html index ddf186cbfc..d0dc0e07e4 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html @@ -1,5 +1,10 @@ - + + + + + + -
{{'FILE_UPLOAD.FILE_INFO.NAME' | translate}}{{'FILE_UPLOAD.FILE_INFO.PROGRESS' | translate}}{{'FILE_UPLOAD.FILE_INFO.SIZE' | translate}}{{'FILE_UPLOAD.FILE_INFO.ACTION' | translate}}
{{file.name}} @@ -18,5 +23,4 @@ pause
\ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js index f628494127..0ccfb42bae 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -System.register(['angular2/core'], function(exports_1, context_1) { +System.register(['angular2/core', 'ng2-translate/ng2-translate'], function(exports_1, context_1) { "use strict"; var __moduleName = context_1 && context_1.id; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -26,12 +26,15 @@ System.register(['angular2/core'], function(exports_1, context_1) { var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; - var core_1; + var core_1, ng2_translate_1; var FileUploadingListComponent; return { setters:[ function (core_1_1) { core_1 = core_1_1; + }, + function (ng2_translate_1_1) { + ng2_translate_1 = ng2_translate_1_1; }], execute: function() { /** @@ -72,7 +75,8 @@ System.register(['angular2/core'], function(exports_1, context_1) { selector: 'alfresco-file-uploading-list', moduleId: __moduleName, templateUrl: './file-uploading-list.component.html', - styleUrls: ['./file-uploading-list.component.css'] + styleUrls: ['./file-uploading-list.component.css'], + pipes: [ng2_translate_1.TranslatePipe] }), __metadata('design:paramtypes', [core_1.ElementRef]) ], FileUploadingListComponent); diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js.map b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js.map index 7ffec5ab29..7a5ba7c5ed 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js.map +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.js.map @@ -1 +1 @@ -{"version":3,"file":"file-uploading-list.component.js","sourceRoot":"","sources":["file-uploading-list.component.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;;;;;YAQH;;;;;;;;;eASG;YAOH;gBAKI,oCAAmB,EAAc;oBAAd,OAAE,GAAF,EAAE,CAAY;oBAC7B,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;oBAElD,WAAW,CAAC;wBACR,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;oBAC9D,CAAC,EAAE,IAAI,CAAC,CAAC;gBACb,CAAC;gBAED;;;;mBAIG;gBACH,0CAAK,GAAL,UAAM,EAAE;oBACJ,IAAI,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAC,kBAAkB;wBACzD,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,CAAC;oBACvC,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACvB,CAAC;gBArBD;oBAAC,YAAK,EAAE;;sFAAA;gBARZ;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,8BAA8B;wBACxC,QAAQ,EAAE,YAAY;wBACtB,WAAW,EAAE,sCAAsC;wBACnD,SAAS,EAAE,CAAC,qCAAqC,CAAC;qBACrD,CAAC;;8CAAA;gBAyBF,iCAAC;YAAD,CAAC,AAxBD,IAwBC;YAxBD,mEAwBC,CAAA"} \ No newline at end of file +{"version":3,"file":"file-uploading-list.component.js","sourceRoot":"","sources":["file-uploading-list.component.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;;;;;;;;YASH;;;;;;;;;eASG;YAQH;gBAKI,oCAAmB,EAAc;oBAAd,OAAE,GAAF,EAAE,CAAY;oBAC7B,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;oBAElD,WAAW,CAAC;wBACR,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;oBAC9D,CAAC,EAAE,IAAI,CAAC,CAAC;gBACb,CAAC;gBAED;;;;mBAIG;gBACH,0CAAK,GAAL,UAAM,EAAE;oBACJ,IAAI,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAC,kBAAkB;wBACzD,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,CAAC;oBACvC,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACvB,CAAC;gBArBD;oBAAC,YAAK,EAAE;;sFAAA;gBATZ;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,8BAA8B;wBACxC,QAAQ,EAAE,YAAY;wBACtB,WAAW,EAAE,sCAAsC;wBACnD,SAAS,EAAE,CAAC,qCAAqC,CAAC;wBAClD,KAAK,EAAE,CAAC,6BAAa,CAAC;qBACzB,CAAC;;8CAAA;gBAyBF,iCAAC;YAAD,CAAC,AAxBD,IAwBC;YAxBD,mEAwBC,CAAA"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts index 56bc4699fc..9644b57940 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts @@ -18,6 +18,7 @@ import {Component, ElementRef, Input} from 'angular2/core'; import {FileModel} from '../models/file.model'; +import {TranslatePipe} from 'ng2-translate/ng2-translate'; declare let __moduleName: string; @@ -35,7 +36,8 @@ declare let __moduleName: string; selector: 'alfresco-file-uploading-list', moduleId: __moduleName, templateUrl: './file-uploading-list.component.html', - styleUrls: ['./file-uploading-list.component.css'] + styleUrls: ['./file-uploading-list.component.css'], + pipes: [TranslatePipe] }) export class FileUploadingListComponent { diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html index 0bc2d2ca93..0470f3bcc0 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html @@ -1,10 +1,11 @@
- file_upload {{'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate}} + file_upload + +
- file_upload {{'FILE_UPLOAD.BUTTON.UPLOAD_FOLDER' | translate}} + file_upload +
- +
\ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 4e27d915b5..1b8ba0139a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -69,7 +69,7 @@ export class UploadButtonComponent { showUdoNotificationBar: boolean = true; @Input() - uploadFolders: boolean = true; + uploadFolders: boolean = false; @Input() multipleFiles: boolean = false;