From 5fa2a8d0750a068ab1f6c19324bf082b5f28c6c6 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Wed, 7 Dec 2016 10:29:47 +0000
Subject: [PATCH] #384 improve style and error messagge

---
 .../app/components/files/files.component.html        |  1 +
 .../src/components/document-list.html                |  5 +++--
 .../src/components/document-list.ts                  | 12 ++++++++++++
 .../src/components/document-menu-action.css          | 11 +++++++++++
 .../src/components/document-menu-action.html         | 11 +++++------
 .../src/components/document-menu-action.ts           |  3 ++-
 .../ng2-alfresco-documentlist/src/i18n/en.json       |  6 ++++++
 7 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
index bbfc19e4e0..f965088d6a 100644
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -19,6 +19,7 @@
                 [contextMenuActions]="true"
                 [contentActions]="true"
                 (error)="onNavigationError($event)"
+                (success)="resetError()"
                 (preview)="showFile($event)"
                 (folderChange)="onFolderChanged($event)">
             <!--
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index d1bbf32cb0..e8f9a8fb5e 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -1,6 +1,7 @@
 <alfresco-document-menu-action *ngIf="contentMenuActions"
-        [currentFolderPath]="currentFolderPath"
-        (onSuccess)="reload()">
+                               [currentFolderPath]="currentFolderPath"
+                               (onSuccess)="onActionMenuSuccess($event)"
+                               (onError)="onActionMenuError($event)">
 </alfresco-document-menu-action>
 <alfresco-datatable
     [data]="data"
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index 59ec16d3ee..a3466262a4 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -121,6 +121,9 @@ export class DocumentList implements OnInit, AfterContentInit {
     @Output()
     preview: EventEmitter<any> = new EventEmitter();
 
+    @Output()
+    success: EventEmitter<any> = new EventEmitter();
+
     @Output()
     error: EventEmitter<any> = new EventEmitter();
 
@@ -402,4 +405,13 @@ export class DocumentList implements OnInit, AfterContentInit {
             this.executeContentAction(node, action);
         }
     }
+
+    onActionMenuError(event) {
+        this.error.emit(event);
+    }
+
+    onActionMenuSuccess(event) {
+        this.reload();
+        this.success.emit(event);
+    }
 }
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css
index 955055a6d7..d9145ab1fd 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css
@@ -71,4 +71,15 @@
 
 .mdl-menu__item-icon {
     margin-right: 32px;
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
+.mdl-menu--bottom-left {
+    width: 200px;
+}
+
+.mdl-menu__text {
+    float: right;
+    margin-right: 22px;
 }
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
index bb542bb0b1..dc1273450e 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html
@@ -1,22 +1,21 @@
 <div class="container">
     <div class="action">
         <button id="actions" class="mdl-button mdl-js-button mdl-button--raised">
-            <i class="material-icons">add</i> Create...
+            <i class="material-icons">add</i> {{ 'BUTTON.ACTION_CREATE' | translate }}
         </button>
         <ul alfresco-mdl-menu class="mdl-menu--bottom-left"
             [attr.for]="'actions'">
             <li class="mdl-menu__item"
                 (click)="showDialog()" >
                 <i class="material-icons mdl-menu__item-icon">folder</i>
-                New Folder
+                <span class="mdl-menu__text">{{ 'BUTTON.ACTION_NEW_FOLDER' | translate }}</span>
             </li>
         </ul>
     </div>
-    <div>{{message}}</div>
 </div>
 
 <dialog class="mdl-dialog" #dialog>
-    <h4 class="mdl-dialog__title">New folder</h4>
+    <h4 class="mdl-dialog__title">{{ 'BUTTON.ACTION_NEW_FOLDER' | translate }}</h4>
     <div class="mdl-dialog__content">
         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
             <input
@@ -30,7 +29,7 @@
         </div>
     </div>
     <div class="mdl-dialog__actions">
-        <button type="button" (click)="createFolder(name.value)" class="mdl-button">Create</button>
-        <button type="button" (click)="cancel()" class="mdl-button close">Cancel</button>
+        <button type="button" (click)="createFolder(name.value)" class="mdl-button">{{ 'BUTTON.CREATE' | translate }}</button>
+        <button type="button" (click)="cancel()" class="mdl-button close">{{ 'BUTTON.CANCEL' | translate }}</button>
     </div>
 </dialog>
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
index 7209e3973b..ae1ee6108f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts
@@ -78,10 +78,11 @@ export class DocumentMenuAction implements OnInit {
                 error => {
                     let errorMessagePlaceholder = this.getErrorMessage(error.response);
                     if (errorMessagePlaceholder) {
-                        this.onError.emit({value: errorMessagePlaceholder});
                         this.message = this.formatString(errorMessagePlaceholder, [name]);
+                        this.onError.emit({message: this.message});
                         console.log(this.message);
                     } else {
+                        this.onError.emit(error);
                         console.log(error);
                     }
                 }
diff --git a/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json b/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
index 438f30d237..e3beb13601 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-documentlist/src/i18n/en.json
@@ -12,5 +12,11 @@
         "ft_ic_archive": "Archive file",
         "ft_ic_presentation": "Presentation file",
         "ft_ic_spreadsheet": "Spreadsheet file"
+    },
+    "BUTTON": {
+        "ACTION_CREATE": "Create...",
+        "ACTION_NEW_FOLDER": "New Folder",
+        "CREATE": "Create",
+        "CANCEL": "Cancel"
     }
 }