From cae13f9196921c1b854d2f199db4dfbdd5868a62 Mon Sep 17 00:00:00 2001
From: Sarah Abouzainah <sabouzainah.ext@orange.com>
Date: Tue, 12 Jan 2021 14:58:54 +0200
Subject: Apply style modifications to done development tasks

Issue-ID: CCSDK-2525

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: I7c676a1fe469d91df7b4f185a1b1e52c5c91c17b
---
 .../configuration-dashboard.component.ts           |  2 +-
 .../packages/designer/designer.component.ts        |  8 +++---
 .../scripts-tab/scripts-tab.component.html         | 17 +++++--------
 .../package-list/package-list.component.ts         |  2 +-
 cds-ui/designer-client/src/styles.css              | 29 ++++++++++++++--------
 5 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'cds-ui')

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
index 7ab8ad7bc..0d92aadfb 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
@@ -175,7 +175,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
                     bluePrintDetailModels => {
                         if (bluePrintDetailModels) {
                             const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1];
-                            this.toastService.info('Package Updated Successfully ');
+                            this.toastService.success('Package Updated Successfully ');
                             this.isSaveEnabled = false;
                             this.router.navigate(['/packages/package/' + id]);
                             this.refreshCurrentPackage(id);
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
index cc7de5f41..652d235a0 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts
@@ -535,12 +535,12 @@ export class DesignerComponent implements OnInit, OnDestroy {
             .then(blob => {
                 this.packageCreationService.savePackage(blob).subscribe(
                     bluePrintDetailModels => {
-                        this.toastService.info('success updating the package');
+                        this.toastService.success('Package is updated successfully');
                         const id = bluePrintDetailModels.toString().split('id')[1].split(':')[1].split('"')[1];
                         this.router.navigate(['/packages/designer/' + id]);
                         console.log('success');
                     }, error => {
-                        this.toastService.error('error happened when editing ' + error.message);
+                        this.toastService.error('Error Occured during editing process' + error.message);
                         console.log('Error -' + error.message);
                     }, () => {
                         this.ngxService.stop();
@@ -591,11 +591,11 @@ export class DesignerComponent implements OnInit, OnDestroy {
                 saveAs(blob, this.viewedPackage.artifactName + '-' + this.viewedPackage.artifactVersion + '-CBA.zip');
 
             }, err => {
-                this.toastService.error('package ' + this.viewedPackage.artifactName + 'has error when downloading' +
+                this.toastService.error('Package ' + this.viewedPackage.artifactName + 'has error when downloading' +
                     err.message);
                 this.ngxService.stop();
             }, () => {
-                this.toastService.success('package ' + this.viewedPackage.artifactName + 'downloaded successfully');
+                this.toastService.success('Package ' + this.viewedPackage.artifactName + 'downloaded successfully');
                 this.ngxService.stop();
             });
     }
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html
index a38027ff5..6782998db 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/scripts-tab/scripts-tab.component.html
@@ -1,16 +1,11 @@
 <div class="import-container-all">
-    <div class="import-container">
-        <div class="import-container-input">
-            <input class="ng-pristine ng-valid ng-touched" placeholder="Enter file URL then ENTER" type="input">
-            <a class="enter-link" href="#"><i class="icon-enter-link"></i></a>
-        </div>
+    <div class="mb-4">
+        <!--Create Script File-->
+    <button type="button" data-target="#createScriptsModal" data-toggle="modal" class="btn mb-2 mr-2 create-script-button"><i class="fa fa-plus"></i> <span></span>Create Script
+    </button>
         <span tourAnchor="st-scriptsImport" class="import-container-span">Or you can also <a data-target="#scriptsModal"
                 data-toggle="modal" (click)="resetTheUploadedFiles()" href="#"><b>Import File</b></a></span>
-
     </div>
-    <!--Create Script File-->
-    <button type="button" data-target="#createScriptsModal" data-toggle="modal" class="btn btn-info mb-2">Create
-    </button>
 
     <!---->
     <div class="accordion">
@@ -135,7 +130,7 @@
 <!-- create script modal -->
 <div aria-hidden="true" aria-labelledby="createScriptsModalLabel" class="modal fade" id="createScriptsModal"
     role="dialog" tabindex="-1">
-    <div class="modal-dialog modal-xl" role="document">
+    <div class="modal-dialog" style="max-width: 60%" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="createScriptsModalLabel">Create Script File</h5>
@@ -210,7 +205,7 @@
                 </button>
                 <button (click)="textCurrentChanges()" data-dismiss="modal" [disabled]="currentFileName?.length == 0 ||
                                 this.currentFileContent?.length == 0" title="Save script file"
-                    class="btn btn-sm btn-primary">Save
+                    class="btn btn-sm btn-primary">Create Script
                 </button>
             </div>
         </div>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
index 0f5210230..2f151d1bf 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.ts
@@ -68,7 +68,7 @@ export class PackageListComponent implements OnInit {
             this.router.navigate(['/packages']);
             this.packagesStore.getAll();
         }, err => {
-            this.toastService.error('Error occured during deleting package ' + err.message);
+            this.toastService.error('Error has occured during deleting package ' + err.message);
         });
 
     }
diff --git a/cds-ui/designer-client/src/styles.css b/cds-ui/designer-client/src/styles.css
index 88c6159f1..0055520a7 100644
--- a/cds-ui/designer-client/src/styles.css
+++ b/cds-ui/designer-client/src/styles.css
@@ -3243,19 +3243,23 @@ padding: 0 10px 0 0;
   padding-bottom: 5px !important;
   overflow: auto;
 }
-.create-template-mapping-button{
-  background: #C3CDDB;
-  border-radius: 50px;
-  font-size: 12px;
-  font-weight: bold;
-  padding: 10px 20px;
+.create-template-mapping-button,
+.create-script-button{
+  background: #C3CDDB !important;
+  border-radius: 50px !important;
+  font-size: 12px !important;
+  font-weight: bold !important;
+  padding: 10px 20px !important; 
   margin-bottom: 20px;
-    display: inline-block;
-    cursor: pointer;
+  display: inline-block;
+  cursor: pointer;
+  color: #1B3E6F !important;
+}
+.create-template-mapping-button i,
+.create-script-button i{
+  margin-right: 5px;
+  
 }
-.create-template-mapping-button i{
-margin-right: 5px;
-  }
 .view-package-container{
   padding: 20px 56px;
 }
@@ -3391,6 +3395,9 @@ margin-right: 5px;
 .mat-table{
   border-top: solid 1px #ECEDF2;
 }
+.mat-row:last-child td {
+  border-bottom: 0 !important;
+}
 .mat-paginator{
   /* display: inline-block; */
   width: 36%;
-- 
cgit 1.2.3-korg