diff options
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/designer')
6 files changed, 41 insertions, 37 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html index c26fe00c2..8746569ba 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/action-attributes/action-attributes.component.html @@ -427,7 +427,7 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-primary" (click)="submitAttributes()">Submit Attributes</button> </div> </div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css index 1b8826fe3..7cb6c5255 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css @@ -137,6 +137,7 @@ header{ height: 16px; */ text-align: center; font-size: 14px; + color: #fff; } .topology-actions .dropdown-text, .dropdown-toggle:hover ~ .dropdown-text, @@ -174,7 +175,7 @@ header{ box-shadow: 0 2px 6px rgba(47, 83, 151, .15) } .topology-actions .dropdown-content a{ - padding: 0 20px 0 15px; + padding: 0 12px; color: #1B3E6F; font-size: 13px; } @@ -445,7 +446,7 @@ p.compType-4{ } */ .functionsList .joint-paper{ width: 100% !important; - height: 72vh !important; + height: 100% !important; /*72vh*/ margin: 0 !important; } .actionBtns .btn{ @@ -612,12 +613,6 @@ p.compType-4{ background-color: #1B3E6F !important; color: #fff; } -.viewBtns .topologySource{ - background-image: url(src/assets/img/icon-topologyView-active.svg); -} -.viewBtns .topologyView{ - background-image: url(src/assets/img/icon-topologySource.svg); -} .card.actionContainer{ margin: 20px 20px 40px 60px; background: transparent; @@ -889,7 +884,7 @@ p.compType-4{ .action-attributes .form-group{ display: inline-block; width: 100%; - padding-left: 12px; + /* padding-left: 12px; */ /* line-height: 30px; */ } .action-attributes .form-group:hover{ @@ -1094,14 +1089,20 @@ p.compType-4{ } .viewBtns .btn{ - margin-top: 14px; - padding-left: 30px!important; + margin-top: 16px; + padding: 0 12px !important; border: 0; font-size: 11px; + line-height: 32px; color: #1B3E6F !important; background-color: #fff !important; - background-repeat: no-repeat; - background-position: 10px center; + /* background-repeat: no-repeat; */ + /* background-position: 10px center; */ +} +.viewBtns .btn i{ + margin-right: 5px; + font-size: 16px; + vertical-align: text-bottom; } .viewBtns .btn.active{ background-color: #1B3E6F !important; @@ -1143,7 +1144,7 @@ ul.editor{ box-shadow: none; } .ace_editor{ - top: 5.4vh; + top: 45px; height: 92vh !important; } .dsl-editor { @@ -1300,7 +1301,8 @@ ul.editor{ border: 0; } .container{ - min-height: 66px; + min-height: 33px; + margin-bottom: 15px; border-bottom: solid 1px #EFEFF4; line-height: 24px; } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html index 96e4bda16..e11302d90 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html @@ -96,8 +96,7 @@ <a (click)="enrichBluePrint()"><i class="icon-enrich" aria-hidden="true"></i> Enrich</a> </li> --> <li> - <a (click)="enrichBluePrint()"><i class="fa fa-play-circle" aria-hidden="true"></i> - Enrich & Deploy</a> + <a (click)="enrichBluePrint()"><i class="fa fa-play-circle" aria-hidden="true"></i> Enrich & Deploy</a> </li> </ul> </div> @@ -165,9 +164,9 @@ <ul class="navbar ml-2" style="list-style: none"> <li class="nav-item"> <div class="btn-group viewBtns" role="group"> - <button type="button" class="btn btn-secondary topologySource active">Designer</button> + <button type="button" class="btn btn-secondary topologySource active"><i class="icon-topologyView-active" aria-hidden="true"></i> Designer</button> <button [routerLink]="['/designer/source', packageId]" type="button" - class="btn btn-secondary topologyView">Scripting + class="btn btn-secondary topologyView"><i class="icon-topologySource" aria-hidden="true"></i>Scripting </button> </div> </li> 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 0c70a497b..0f6e38c38 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 @@ -510,7 +510,7 @@ export class DesignerComponent implements OnInit, OnDestroy { this.ngxService.stop(); }); }, error => { - this.toastService.error(error.mesasge, 'error happened '); + this.toastService.error(error.mesasge, 'Error occurs during enrichment process'); console.error('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -532,12 +532,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 successfully updated '); 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 when editing ' + error.message); console.log('Error -' + error.message); }, () => { this.ngxService.stop(); @@ -583,11 +583,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 + 'has been downloaded successfully'); this.ngxService.stop(); }); } diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html index 8879d539d..ea17f888d 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/functions-attribute/functions-attribute.component.html @@ -59,7 +59,8 @@ <div class="custom-control custom-radio custom-control-inline"> <input type="radio" id="functionRadioInline" name="functionRadioInline" [checked]="!currentFuncion['inputs']['artifact-prefix-names']?.get_input" - (click)="setArtifact(true)" class="custom-control-input"> + (click)="setArtifact(true)" + class="custom-control-input"> <label class="custom-control-label" for="functionRadioInline">Pre-defined Template</label> </div> @@ -205,6 +206,7 @@ </div> </div> </div> + <br/> <button class="btn btn-select-template m-auto" (click)="saveFunctionData()">Save</button> </div> @@ -221,20 +223,21 @@ </button> </div> <div class="modal-body createAttributeTabs"> - <div class="col-4" *ngFor="let file of getKeys(templateAndMappingMap)"> + <div class="row"> + <div class="col-6" *ngFor="let file of getKeys(templateAndMappingMap)"> <a class="template-mapping-list float" [class.active]="selectedTemplates.has(file)"> <p (click)="setTemplate(file)">{{file}}</p> <span *ngIf="getValue(file,templateAndMappingMap).isMapping">Mapping</span> <span *ngIf="getValue(file,templateAndMappingMap).isTemplate">Template</span> </a> - + </div> </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" (click)="cancel()" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" (click)="cancel()" data-dismiss="modal">Close</button> <button type="button" class="btn btn-primary" data-dismiss="modal" (click)="addTemplates()">Add - Templates</button> + Template</button> </div> </div> </div> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html index 1042024f3..30f657d12 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html @@ -126,24 +126,23 @@ </li> <li class="nav-item"> - <div class="btn-group viewBtns" role="group"> + <div class="btn-group viewBtns source-view-bar" role="group"> <button (click)="convertAndOpenInDesingerView(viewedPackage.id)" type="button" - class="btn btn-secondary topologySource">Designer</button> - <button type="button" class="btn btn-secondary topologyView active">Scripting</button> + class="btn btn-secondary topologySource"><i class="icon-topologyView-active" aria-hidden="true"></i> Designer</button> + <button type="button" class="btn btn-secondary topologyView active"><i class="icon-topologySource" aria-hidden="true"></i>Scripting</button> </div> </li> </ul> - </div> </nav> <ng-sidebar-container class="sidebar-container"> - <!-- Controller SideBar --> + <ng-sidebar [(opened)]="controllerSideBar" [sidebarClass]="'demo-sidebar controllerSidebar container-fluid'" [mode]="'push'" #sidebarLeft> <div class="row"> <div class="col"> - <input type="text" class="form-control input-search-controller" placeholder="Search Functions"> + <input type="text" class="form-control input-search-controller" placeholder="Search"> </div> </div> @@ -157,4 +156,5 @@ [theme]="'tomorrow_night_bright'" #editor style="height:500px"> </ace-editor> - </div>
\ No newline at end of file + </div> + </ng-sidebar-container>
\ No newline at end of file |