Merge "Fix long package name and apply mapping table style"

7 files changed, 107 insertions, 99 deletions

diff --git a/cds-ui/designer-client/src/app/app.module.ts b/cds-ui/designer-client/src/app/app.module.ts
index d6e9b36df..da7ddfbd0 100644
--- a/cds-ui/designer-client/src/app/app.module.ts
+++ b/cds-ui/designer-client/src/app/app.module.ts
@@ -35,6 +35,7 @@ import {SharedModulesModule} from './modules/shared-modules/shared-modules.modul
 import {NgxFileDropModule} from 'ngx-file-drop';
 import {ResourceDictionaryModule} from './modules/feature-modules/resource-dictionary/resource-dictionary.module';
 
+
 @NgModule({
     declarations: [
         AppComponent,
@@ -51,7 +52,7 @@ import {ResourceDictionaryModule} from './modules/feature-modules/resource-dicti
         SharedModulesModule,
         NgxFileDropModule,
         ResourceDictionaryModule,
-        SidebarModule
+        SidebarModule,
     ],
 
     providers: [ApiService],
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
index 1ff03b221..ceb2bd497 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.html
@@ -23,7 +23,7 @@
             <div class="container">
                 <div class="creat-action-container">
 
-                    <a href="#" class="action-button" (click)="editBluePrint()">
+                    <a href="#" class="action-button save" (click)="editBluePrint()">
                         <i class="icon-save-sm" aria-hidden="true"></i>
                         <span>Save</span>
                     </a>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
index de2b3831d..6622f6700 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/metadata-tab/metadata-tab.component.html
@@ -62,7 +62,7 @@
             <input type="input" (keyup.enter)="addTag($event)" [(ngModel)]="metaDataTab.tags"
                 placeholder="Ex., vDNS-CDS">
         </div>
-        <div class="model-note-container tag-notes">Seprate tags with comma or space</div>
+        <div class="model-note-container tag-notes">Use ENTER to add tag</div>
         <div class="model-note-container tages-container">
             <span *ngFor="let tag of tags" class="single-tage">{{tag}}
                 <i (click)="removeTag(tag)" class="fa fa-times-circle"></i>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html
index 1253dc10b..ee4368711 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html
@@ -20,7 +20,7 @@
         <div class="container-fluid body-container">
             <div class="container">
                 <div class="creat-action-container">
-                    <a href="#" class="action-button" (click)="saveBluePrint()">
+                    <a href="#" class="action-button save" (click)="saveBluePrint()">
                         <i class="icon-save-sm" aria-hidden="true"></i>
                         <span>Save</span>
                     </a>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
index a33087461..16c3101f2 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/templ-mapp-creation/templ-mapp-creation.component.html
@@ -58,7 +58,7 @@
                         <a href="#" data-toggle="modal" (click)="allowedExt=[getFileExtension()]"
                             data-target="#templateModal"><b>Import
                                 File</b></a></div>
-                    <div class="editor-container">
+                    <div class="editor-container mb-4">
                         <app-source-editor (textChange)="textChanges($event,templateInfo.fileName)"
                             [(text)]="templateFileContent"></app-source-editor>
                     </div>
@@ -87,7 +87,7 @@
                             class="mapping-source-load">
                             <i class="icon-upload-attributes"></i>
                             <br />
-                            <div>Upload attribute list</div>
+                            <div>Upload Attributes List</div>
                             <div class="source-load-note">(Should be comma delimited file)</div>
                         </a>
                         <!-- <a href="#" class="mapping-source-load">
@@ -119,8 +119,8 @@
                         <tbody>
                             <tr *ngFor="let dict of resourceDictionaryRes">
                                 <td>
-                                    <img *ngIf="dict.definition?.property?.required" src="/assets/img/icon-required-no.svg">
-                                    <img *ngIf="!dict.definition?.property?.required" src="/assets/img/icon-required-yes.svg">
+                                    <img *ngIf="dict.definition?.property?.required" src="/assets/img/icon-required-yes.svg">
+                                    <img *ngIf="!dict.definition?.property?.required" src="/assets/img/icon-required-no.svg">
                                 </td>
                                 <td>{{ dict.name }}</td>
                                 <td>{{ dict.name }}</td>
@@ -166,8 +166,8 @@
                         <tbody>
                             <tr *ngFor="let dict of mappingRes">
                                 <td>
-                                    <i *ngIf="dict.definition?.property?.required" class="fa fa-check-square mx-2"></i>
-                                    <i *ngIf="!dict.definition?.property?.required" class="fa fa-square mx-2"></i>
+                                    <img *ngIf="dict.definition?.property?.required" src="/assets/img/icon-required-yes.svg">
+                                    <img *ngIf="!dict.definition?.property?.required" src="/assets/img/icon-required-no.svg">
                                 </td>
                                 <td>{{ dict['name'] }}</td>
                                 <td>{{ dict['name'] }}</td>
@@ -194,8 +194,8 @@
 
         </div>
         <div class="template-mapping-action">
-            <button class="btn btn-sm btn-outline-secondary">Cancel</button>
-            <button (click)="saveToStore()" class="btn btn-sm btn-primary">Submit</button>
+            <button class="btn btn-outline-secondary">Cancel</button>
+            <button (click)="saveToStore()" class="btn btn-primary">Submit</button>
         </div>
     </div>
 </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
index ed67dff40..49c80d3ac 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
@@ -8,10 +8,12 @@
             <div class="card-footer row">
                 <div class="col text-center">
                     <a routerLink="/packages/createPackage" role="button" aria-pressed="true"
-                        class="btn-create-package float"><i class="icon-create-white" aria-hidden="true"></i>Create Package
+                        class="btn-create-package float"><i class="icon-create-white" aria-hidden="true"></i>Create
+                        Package
                     </a>
-                    <br/>
-                    <a href="#" role="button" aria-pressed="true" class="btn-import-package float mb-3"><i class="icon-import-blue" aria-hidden="true"></i>Import Package
+                    <br />
+                    <a href="#" role="button" aria-pressed="true" class="btn-import-package float mb-3"><i
+                            class="icon-import-blue" aria-hidden="true"></i>Import Package
                     </a>
                 </div>
             </div>
@@ -19,102 +21,105 @@
     </div>
     <div class="col-lg-3 col-md-6 d-flex" *ngFor="let bluePrint of viewedPackages">
         <!--Card 1-->
-            <div class="card">
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-9 pr-0">
-                            <a class="card-title" [routerLink]="['/packages/package', bluePrint.id]"
-                                (click)="testDispatch(bluePrint)">
-                                <!-- <img class="icon-deployed" src="/assets/img/icon-deploy.svg"> -->
-                                {{bluePrint.artifactName}}<span>.vLB.CDS</span>
-                                <span class="package-version">Version 1.0.2</span>
-                            </a>
-
-                        </div>
-                        <div class="col-3">
+        <div class="card">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-10 pr-0">
+                        <a class="card-title" [routerLink]="['/packages/package', bluePrint.id]"
+                            (click)="testDispatch(bluePrint)">
+                            <!-- <img class="icon-deployed" src="/assets/img/icon-deploy.svg"> -->
+                            <p class="packageName" tooltip="{{bluePrint.artifactName}}" placement="bottom">
+                                {{bluePrint.artifactName}}<span>.vLB.CDS</span></p>
+                            <span class="package-version">V 1.0.2</span>
+                        </a>
 
-                            <div class="dropdown">
-                                <input class="dropdown-toggle" type="text">
-                                <div class="dropdown-text">
-                                    <!-- <img src="/assets/img/icon-menuDots.svg" title="Actions"> -->
-                                    <i class="icon-menuDots" aria-hidden="true"></i>
-                                </div>
-                                <ul class="dropdown-content">
-                                    <li class="action-clone">
-                                        <a href="#">
-                                            <i class="icon-clone-sm" aria-hidden="true"></i>
-                                            Clone
-                                        </a>
-                                    </li>
-                                    <li class="action-archive">
-                                        <a href="#">
-                                            <i class="icon-archive-sm" aria-hidden="true"></i>
-                                            Archive
-                                        </a>
-                                    </li>
-                                    <li class="action-archive">
-                                        <a href="#">
-                                            <i class="icon-download" aria-hidden="true"></i>
-                                            Download
-                                        </a>
-                                    </li>
-                                    <li class="action-delete">
-                                        <a href="#">
-                                            <i class="icon-delete-sm" aria-hidden="true"></i>
-                                            Delete
-                                        </a>
-                                    </li>
-                                </ul>
-                            </div>
-
-                        </div>
                     </div>
-                    <div class="row">
-                        <div class="col">
-                            <p class="mb-0 mt-1">Last modified {{ bluePrint.createdDate | date:'short' }}
-                            </p>
-                            <p class="mb-2">By {{bluePrint.updatedBy}}</p>
-                            <p class="package-desc tooltip-bottom" data-tooltip="DESCRIPTION:
-                            The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from de Finibus Bonorum et Malorum by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.">Description text quisquam est dolorem, velit...</p>
-                            
-                            <ul class="package-contributers">
-                                <li>
-                                    <button type="button" class="border-fade" data-toggle="tooltip"
-                                        data-placement="bottom" title="User name">
-                                        <img src="/assets/img/img-user1.jpeg">
-                                    </button>
+                    <div class="col-2">
+                        <div class="dropdown">
+                            <input class="dropdown-toggle" type="text">
+                            <div class="dropdown-text">
+                                <!-- <img src="/assets/img/icon-menuDots.svg" title="Actions"> -->
+                                <i class="icon-menuDots" aria-hidden="true"></i>
+                            </div>
+                            <ul class="dropdown-content">
+                                <li class="action-clone">
+                                    <a href="#">
+                                        <i class="icon-clone-sm" aria-hidden="true"></i>
+                                        Clone
+                                    </a>
                                 </li>
-                                <li>
-                                    <button type="button" data-toggle="tooltip" data-placement="bottom"
-                                        title="User name">
-                                        <img src="/assets/img/img-user2.jpg">
-                                    </button>
+                                <li class="action-archive">
+                                    <a href="#">
+                                        <i class="icon-archive-sm" aria-hidden="true"></i>
+                                        Archive
+                                    </a>
                                 </li>
-                                <li>
-                                    <button type="button" data-toggle="tooltip" data-placement="bottom"
-                                        title="User name">
-                                        <img src="/assets/img/img-user3.jpg">
-                                    </button>
+                                <li class="action-archive">
+                                    <a href="#">
+                                        <i class="icon-download" aria-hidden="true"></i>
+                                        Download
+                                    </a>
                                 </li>
-                                <li>
-                                    <a href="">5 contributors</a>
+                                <li class="action-delete">
+                                    <a href="#">
+                                        <i class="icon-delete-sm" aria-hidden="true"></i>
+                                        Delete
+                                    </a>
                                 </li>
                             </ul>
                         </div>
+
                     </div>
-                    <div class="card-footer">
-                        <div class="row">
-                            <div class="col">
-                                <button type="button" class="btn btn-card-topology"><i class="icon-btn-card-topology" aria-hidden="true"></i>Designer Mode
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <p class="mb-0 mt-1">Last modified {{ bluePrint.createdDate | date:'short' }}
+                        </p>
+                        <p class="mb-2">By {{bluePrint.updatedBy}}</p>
+                        <p class="package-desc" [delay]="300"
+                            tooltip="DESCRIPTION:
+                            The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from de Finibus Bonorum et Malorum by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham."
+                            placement="auto">Description text quisquam est dolorem, velitThe standard chunk of Lorem
+                            Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and
+                            1.10.33 from de Finibus Bonorum et</p>
+                        <ul class="package-contributers">
+                            <li>
+                                <button type="button" class="border-fade" data-toggle="tooltip" data-placement="bottom"
+                                    title="User name">
+                                    <img src="/assets/img/img-user1.jpeg">
                                 </button>
-                            </div>
-                            <div class="col">
-                                <button type="button" (click)="view(bluePrint.id)" class="btn btn-card-config"><i class="icon-btn-card-config" aria-hidden="true"></i>Configuration</button>
-                            </div>
+                            </li>
+                            <li>
+                                <button type="button" data-toggle="tooltip" data-placement="bottom" title="User name">
+                                    <img src="/assets/img/img-user2.jpg">
+                                </button>
+                            </li>
+                            <li>
+                                <button type="button" data-toggle="tooltip" data-placement="bottom" title="User name">
+                                    <img src="/assets/img/img-user3.jpg">
+                                </button>
+                            </li>
+                            <li>
+                                <a href="">5 contributors</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="card-footer">
+                    <div class="row">
+                        <div class="col">
+                            <button type="button" class="btn btn-card-topology"><i class="icon-btn-card-topology"
+                                    aria-hidden="true"></i>Designer Mode
+                            </button>
+                        </div>
+                        <div class="col">
+                            <button type="button" (click)="view(bluePrint.id)" class="btn btn-card-config"><i
+                                    class="icon-btn-card-config" aria-hidden="true"></i>Configuration</button>
                         </div>
                     </div>
                 </div>
-
             </div>
+
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/shared-modules.module.ts b/cds-ui/designer-client/src/app/modules/shared-modules/shared-modules.module.ts
index 7229891f5..7663fb8dc 100644
--- a/cds-ui/designer-client/src/app/modules/shared-modules/shared-modules.module.ts
+++ b/cds-ui/designer-client/src/app/modules/shared-modules/shared-modules.module.ts
@@ -2,13 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HeaderComponent } from './header/header.component';
 import { RouterModule } from '@angular/router';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
 
 @NgModule({
   declarations: [HeaderComponent],
   imports: [
     CommonModule,
     RouterModule,
+    TooltipModule.forRoot(),
   ],
-  exports : [HeaderComponent]
+  exports : [HeaderComponent, TooltipModule, ]
 })
 export class SharedModulesModule { }