diff --git a/client/cat3/src/partials/sections/card/card.scss b/client/cat3/src/partials/sections/card/card.scss index 356ac5121..8328ff74d 100644 --- a/client/cat3/src/partials/sections/card/card.scss +++ b/client/cat3/src/partials/sections/card/card.scss @@ -350,12 +350,12 @@ $imagePath : "/cat3/images"; .bp-version-dropdown-wrapper { height: 40px; - margin: 4px 0 0 19px; + margin: 4px 0 0 36px; } .bp-version-dropdown-wrapper-docker { height: 31px; - margin: -3px 0 0 19px; + margin: -3px 0 0 36px; } .btnicons { @@ -392,11 +392,11 @@ $imagePath : "/cat3/images"; } .blueprint-buttons { - margin: 0 0 0 32px; + margin: 0 0 0 45px; } .blueprint-buttons-docker { - margin: 5px 0 0 32px; + margin: 5px 0 0 45px; } .bp-version-dropdown { diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js index 5397a2c88..ab34f6454 100755 --- a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js @@ -14,7 +14,7 @@ var dockerTemplates = $scope.dockerTemplateList; for(var j=0;j ' + '  ' + '  ' + - '  '} + '  '} ]; bpcolumnDefs = dockerOptions; } else if(val.templateType === 'chef' || val.templateType === 'ami'){ var bpOptions = [ - { name:'Name',minWidth:150,field:'name' }, - { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS'}, - { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId'}, + { name:'Name',minWidth:150,field:'name',cellTooltip: true }, + { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS',cellTooltip: true}, + { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId',cellTooltip: true}, { name:'Region',minWidth:150,field:'blueprintConfig.cloudProviderData.region',visible: false}, { name:'Template Type',minWidth:150,cellTemplate:'
{{grid.appScope.getTemplate(row.entity.templateType)}}
'}, { name:'Instance Type',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceType'}, - { name:'Keypair',minWidth:150,field:'blueprintConfig.cloudProviderData.keyPairId',visible: false}, { name:'Subnet',minWidth:150,field:'blueprintConfig.cloudProviderData.subnetId',visible: false}, - { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]'}, + { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]',cellTooltip: true}, { name:'Action',minWidth:200,cellTemplate:' ' + '  ' + '  ' + - '  '} + '  '} ]; bpcolumnDefs = bpOptions; } else if(val.templateType === 'cft') { var cftOptions = [ - { name:'Name',minWidth:150,field:'name' }, + { name:'Name',minWidth:150,field:'name',cellTooltip: true }, { name:'Cloud Provider',minWidth:150,field:'blueprintConfig.cloudProviderType'}, { name:'Region',minWidth:150,field:'blueprintConfig.region'}, { name:'Template Type',minWidth:150,cellTemplate:'
{{grid.appScope.getTemplate(row.entity.templateType)}}
'}, { name:'Action',minWidth:150,cellTemplate:' ' + '  ' + '  ' + - '  '} + '  '} ]; bpcolumnDefs = cftOptions; } else if(val.templateType === 'arm') { var cftOptions = [ - { name:'Name',minWidth:150,field:'name' }, + { name:'Name',minWidth:150,field:'name',cellTooltip: true }, { name:'Infra Manager Type',minWidth:150,field:'blueprintConfig.infraMangerType'}, - { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup'}, + { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup',cellTooltip: true}, { name:'Template Type',minWidth:150,cellTemplate:'
{{grid.appScope.getTemplate(row.entity.templateType)}}
'}, { name:'Action',minWidth:150,cellTemplate:' ' + '  ' + '  ' + - '  '} + '  '} ]; bpcolumnDefs = cftOptions; } diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js index d16febcab..c70f46bb9 100755 --- a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js @@ -10,6 +10,7 @@ createCBP.compositeBPType='chef'; $scope.chefrunlist,$scope.cookbookAttributes = []; createCBP.onSubmit =false; + $scope.compositeEnabled = true; createCBP.newEnt={ bpName:'' }; @@ -65,6 +66,7 @@ }; $scope.compositeSave =function () { createCBP.onSubmit =true; + $scope.compositeEnabled = false; if(!createCBP.newEnt.bpName || !createCBP.SelectedBPList.length > 0){ return true; } @@ -94,6 +96,7 @@ gencSers.promisePost(params).then(function () { toastr.success('Successfully Created.'); $state.go('dashboard.design.list',{providerName:$state.params.providerName,templateObj:$state.params.templateObj}); + $scope.compositeEnabled = true; }); }; createCBP.createList(); diff --git a/client/cat3/src/partials/sections/dashboard/design/design.html b/client/cat3/src/partials/sections/dashboard/design/design.html index 2823d9978..b0b0ea747 100644 --- a/client/cat3/src/partials/sections/dashboard/design/design.html +++ b/client/cat3/src/partials/sections/dashboard/design/design.html @@ -79,7 +79,7 @@
  • New
  • New
  • -
    • diff --git a/client/cat3/src/partials/sections/dashboard/design/design.scss b/client/cat3/src/partials/sections/dashboard/design/design.scss index 18c3297ea..a748de6be 100755 --- a/client/cat3/src/partials/sections/dashboard/design/design.scss +++ b/client/cat3/src/partials/sections/dashboard/design/design.scss @@ -169,9 +169,6 @@ label { .activeLi{ background: #E2E2E2 !important; } -.bpListComp :hover{ - cursor:move !important; -} .badge :hover{ cursor: pointer !important; } @@ -284,127 +281,6 @@ label { } } - - -#crumbs{ - margin: auto; - width: 100%; -} -.stp{ - font-size: 25px; -} -#crumbs ul { - list-style: none; display: block; - -} -#crumbs ul li { - background: rgb(242, 242, 242); margin: 0px 20px; display: inline-block; - margin-bottom: 5px; -} -#crumbs ul li div { - margin: 0px 10px 0px 0px; text-align: left; color: rgb(0, 0, 0); font-size: 12px; text-decoration: none; float: left; display: block; position: relative; -} -#crumbs ul li div br { - color: rgb(255, 255, 255); -} -#crumbs ul li div { - padding: 0px 0 0 7px; - font-size: 14px; - font-weight: 600; - width: 102%; -} -#crumbs ul li div::after { - top: 0px; - right: -34px; - border-top-color: transparent; - border-bottom-color: transparent; - border-left-color: rgb(242, 242, 242); - border-top-width: 22px; - border-bottom-width: 20px; - border-left-width: 24px; - border-top-style: solid; - border-bottom-style: solid; - border-left-style: solid; - position: absolute; - z-index: 1; - content: ""; -} -#crumbs ul .active div::after{ - border-top-width: 18px !important; - border-bottom-width: 32px !important; -} -#crumbs ul li div::before { - left: 0px; top: 0px; position: absolute; content: ""; -} -#crumbs ul li:hover { - background: rgb(0, 158, 224); color: rgb(255, 255, 255); -} -#crumbs ul li div:hover::after { - border-left-color: rgb(0, 158, 224); -} - - -#crumbs ul li.finished { - background: #5cb85c; -} -#crumbs ul li.finished { - color: rgb(255, 255, 255); -} -#crumbs ul li.finished div { - color: rgb(255, 255, 255); -} -#crumbs ul li.finished div::after { - border-left-color: #5cb85c; -} -#crumbs ul li.finished:hover { - background: #40BAF1; -} -#crumbs ul li.finished:hover div::after { - border-left-color: #40BAF1; -} -ul.simple-list > li.finished::before { - color: rgb(255, 255, 255); -} - - - -#crumbs ul li.selected { - background: #40BAF1; -} -#crumbs ul li.selected { - color: rgb(255, 255, 255); -} -#crumbs ul li.selected div { - color: rgb(255, 255, 255); -} -#crumbs ul li.selected div::after { - border-left-color: #40BAF1; -} - -ul.simple-list > li:hover::before { - color: rgb(255, 255, 255); -} -ul.simple-list > li.selected::before { - color: rgb(255, 255, 255); -} -ul.simple-list { - padding: 0px; list-style-type: none; counter-reset: li-counter; -} -ul.simple-list > li { - margin-bottom: 20px; position: relative; min-height: 3em; -} -ul.simple-list > li:hover::before { - color: rgb(255, 255, 255); -} -ul.simple-list > li::after { - height: 0px; clear: both; display: block; visibility: hidden; content: ""; -} -#crumbs ul.simple-list > li:hover div { - color: rgb(255, 255, 255); -} -#crumbs ul.simple-list > li:hover div::after { - -} .disabled{ cursor:not-allowed !important; box-shadow: none; @@ -454,3 +330,21 @@ fieldset#compBlueprint legend { margin-left: 10px; width: 98%; } + +.listPageView { + height: 450px; + overflow-y:auto; +} + +.bpCardDetails { + width: 160px; + padding: 0px; + position: relative; + float: left; + margin-bottom: 5px; + margin-right: 8px; +} + +.layersClassComposite { + margin-left: 10px; +} \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js index 6d6d6be13..a88be966f 100755 --- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js +++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js @@ -86,6 +86,7 @@ }; genericServices.promisePost(params).then(function () { toastr.success('Successfully copied.'); + $rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT'); }); }); }; diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html index a9b966b47..2616b32ca 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -32,7 +32,8 @@
    @@ -106,7 +106,7 @@ {{val.value}} - + @@ -123,5 +123,5 @@
    - +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html index 38f656b00..7a1ca48fc 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html @@ -5,18 +5,18 @@
    - - + +

    No Data Found!
    -
    -
    +
    +
    @@ -28,7 +28,7 @@
    - +
    @@ -37,8 +37,8 @@
    -
    -
    +
    +
    @@ -50,7 +50,7 @@
  • - +
    • diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss index 2eaccb24e..3b62220a4 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss @@ -46,6 +46,10 @@ overflow-y: auto; } + .titleName { + word-wrap: break-word; + } + .td-padding { padding-left: 18px; padding-top:16px; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html index 1e24c6147..21b542d0d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html @@ -1,7 +1,7 @@
    × -

    Blueprint Information - {{blueprintInfo.name}}

    +

    Blueprint Information - {{blueprintInfo.name}}

    diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index d7db20466..b9fd89e7e 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -70,7 +70,7 @@ }; workzoneServices.launchCompsiteBlueprint(compBlue).success(function() { toastr.success('Successfully launched composite blueprint'); - return false; + $modalInstance.close(compBlue); }).error(function(data) { toastr.error(data.message, 'Error'); });