From 995f421c888fc28b7f6f80a81c258b9d65f06264 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 20 Sep 2018 08:28:01 -0700
Subject: [PATCH] SHIBUI-814

---
 backend/src/main/resources/i18n/messages_en.properties        | 3 ++-
 .../domain/component/forms/advanced-info-form.component.html  | 2 +-
 .../component/forms/organization-info-form.component.html     | 2 +-
 ui/src/app/schema-form/widget/array/array.component.html      | 2 +-
 .../widget/boolean-radio/boolean-radio.component.html         | 2 +-
 ui/src/app/schema-form/widget/check/checkbox.component.html   | 2 +-
 .../app/schema-form/widget/datalist/datalist.component.html   | 2 +-
 .../widget/filter-target/filter-target.component.html         | 4 ++--
 ui/src/app/schema-form/widget/number/number.component.html    | 3 +--
 ui/src/app/schema-form/widget/select/select.component.html    | 3 +--
 ui/src/app/schema-form/widget/string/string.component.html    | 2 +-
 .../app/schema-form/widget/textarea/textarea.component.html   | 3 +--
 12 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 52cf82c81..2c6a755ab 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -9,7 +9,8 @@ action.delete=Delete
 action.remove=Remove
 action.save=Save
 action.toggle=Toggle { label }
-action.add-contacts=Add Contact
+action.add-contact=Add Contact
+action.add-contacts=Add Contacts
 action.use-mine=Use My Changes
 action.use-theirs=Use Their Changes
 action.discard-changes=Discard Changes
diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html
index 6f4bbb73c..50c608d33 100644
--- a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html
+++ b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html
@@ -138,7 +138,7 @@
         <fieldset class="form-section col">
             <p>
                 <translate-i18n key="label.contact-information">Contact Information:</translate-i18n>&nbsp;&nbsp;
-                <button class="btn btn-success btn-sm" (click)="addContact()" translate="action.add-contacts" aria-label="Add contact to accordion group" role="button">
+                <button class="btn btn-success btn-sm" (click)="addContact()" translate="action.add-contact" aria-label="Add contact to accordion group" role="button">
                     Add Contact
                 </button>
             </p>
diff --git a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html
index 1364b5577..3062590e4 100644
--- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html
+++ b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html
@@ -65,7 +65,7 @@
         </fieldset>
         <fieldset class="form-section col">
             <p>
-                <translate-i18n key="label.contact-information">Contact Information: </translate-i18n>
+                <translate-i18n key="label.contact-information">Contact Information: </translate-i18n>&nbsp;&nbsp;
                 <button class="btn btn-success btn-sm" (click)="addContact()" translate="action.add-contact" aria-label="Add contact to accordion group" role="button">Add Contact</button>
             </p>
             <div formArrayName="contacts" class="bg-light border rounded p-4" *ngIf="contacts.length">
diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
index 56fbc4e63..6e0643d65 100644
--- a/ui/src/app/schema-form/widget/array/array.component.html
+++ b/ui/src/app/schema-form/widget/array/array.component.html
@@ -5,7 +5,7 @@
         </label>
         &nbsp;
         <button (click)="addItem()" class="btn btn-success btn-sm array-add-button">
-            <translate-i18n key="action.add">Add</translate-i18n> &nbsp;
+            <translate-i18n key="action.add">Add</translate-i18n>&nbsp;&nbsp;
             <i class="fa fa-plus" aria-hidden="true"></i>
         </button>
         &nbsp;
diff --git a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
index 78108413b..5a23b6b82 100644
--- a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
+++ b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
@@ -4,7 +4,7 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
                 i18n-aria-label="tooltip.instruction"
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
index e33c122b6..e499eb17b 100644
--- a/ui/src/app/schema-form/widget/check/checkbox.component.html
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -17,7 +17,7 @@
             <div>
                 <ng-template #tooltip>
                     <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-                </ng-template>
+                </ng-template>&nbsp;&nbsp;
                 <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltip"
                     [attr.aria-label]="'tooltip.instruction' | translate"></i>
             </div>
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index 907365ef8..b83f9c145 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -7,7 +7,7 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
                 i18n-aria-label="tooltip.instruction"
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
index 11f7fcc5e..69e1860f3 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
@@ -41,7 +41,7 @@
                     <span>
                         <translate-i18n key="label.search-criteria-by" [params]="{ displayType: (displayType | translate) }">
                             Search Criteria by {{ this.displayType | translate }}
-                        </translate-i18n>
+                        </translate-i18n>&nbsp;&nbsp;
                         <i class="fa fa-asterisk text-danger"
                             aria-hidden="true"
                             *ngIf="entityAttributesFilterTargetType !== 'ENTITY'"></i>
@@ -49,7 +49,7 @@
                     <span>
                         <ng-template #tooltipCriteria>
                             <translate-i18n key="label.search-criteria-by" [params]="{ displayType: (displayType | translate) }">Search Criteria by {{ this.displayType }}</translate-i18n>
-                        </ng-template>
+                        </ng-template>&nbsp;&nbsp;
                         <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                             [ngbPopover]="tooltipCriteria"
                            
diff --git a/ui/src/app/schema-form/widget/number/number.component.html b/ui/src/app/schema-form/widget/number/number.component.html
index 4594a33dc..8f50e41af 100644
--- a/ui/src/app/schema-form/widget/number/number.component.html
+++ b/ui/src/app/schema-form/widget/number/number.component.html
@@ -7,10 +7,9 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
-               
                 [attr.aria-label]="'tooltip.instruction' | translate"></i>
         </span>
     </label>
diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index dced44e28..4b3437484 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -7,10 +7,9 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
-               
                 [attr.aria-label]="'tooltip.instruction' | translate"></i>
         </span>
     </label>
diff --git a/ui/src/app/schema-form/widget/string/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
index 100e3f646..fe4152b68 100644
--- a/ui/src/app/schema-form/widget/string/string.component.html
+++ b/ui/src/app/schema-form/widget/string/string.component.html
@@ -5,7 +5,7 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
                 [attr.aria-label]="'tooltip.instruction' | translate"></i>
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.html b/ui/src/app/schema-form/widget/textarea/textarea.component.html
index f639ca107..b14bbc489 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.html
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.html
@@ -7,10 +7,9 @@
         <span *ngIf="schema.description">
             <ng-template #tooltip>
                 <translate-i18n [key]="schema.description">{{ schema.description }}</translate-i18n>
-            </ng-template>
+            </ng-template>&nbsp;&nbsp;
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
                 [ngbPopover]="tooltip"
-               
                 [attr.aria-label]="'tooltip.instruction' | translate"></i>
         </span>
     </label>