summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-02-15 21:21:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-15 21:21:45 +0000
commitf1eadf965e40cac4f12c991bddcf870b30ec6ce6 (patch)
treef08824a5e28258097170c93547f4213d0bb9cf3f
parentabbd3a659faccc2b252ff477138427c12b808bd4 (diff)
parent3a2bf19c4989dae9a491b743075d553f665060d4 (diff)
Merge "Resource definition horizontal stepper"
-rw-r--r--cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts20
-rw-r--r--cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html20
-rw-r--r--cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss14
3 files changed, 19 insertions, 35 deletions
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
index 986c28844..2f0b3fe30 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
@@ -25,25 +25,7 @@ import { ResourceDefinitionComponent } from './resource-definition.component';
const routes: Routes = [
{
path: '',
- component: ResourceDefinitionComponent,
- children: [
- {
- path: '',
- loadChildren: './resource-creation/resource-creation.module#ResourceCreationModule'
- },
- {
- path: 'resource-creation',
- loadChildren: './resource-creation/resource-creation.module#ResourceCreationModule'
- },
- {
- path: 'resource-edit',
- loadChildren: './resource-edit/resource-edit.module#ResourceEditModule'
- },
- {
- path: 'save-resource',
- loadChildren: './save-resource/save-resource.module#SaveResourceModule'
- }
- ]
+ component: ResourceDefinitionComponent
}
];
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
index 6d3186c98..60a8b94ec 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
@@ -20,29 +20,19 @@
<!-- <app-cbawizard [appName]="appName"></app-cbawizard>
<router-outlet></router-outlet> -->
-<mat-card class="CBAform">
+<mat-card class="RDform">
<mat-card-content>
<mat-horizontal-stepper [linear]="isLinear" #stepper>
<mat-step [stepControl]="firstFormGroup">
<ng-template matStepLabel>Resource creation Method</ng-template>
- <app-resource-creation></app-resource-creation>
+ <app-resource-creation></app-resource-creation><br><br>
<div>
- <button mat-button matStepperNext style="color:white;background:gray">Proceed</button>
+ <button mat-button matStepperNext class="matStepNextBtn">Proceed</button>
</div>
</mat-step>
<mat-step [stepControl]="secondFormGroup">
- <ng-template matStepLabel>Resource Edit/Validate </ng-template>
- <app-resource-edit></app-resource-edit>
- <!-- <div>
- <button mat-button matStepperNext style="color:white;background:gray">Proceed</button>
- </div> -->
- </mat-step>
- <mat-step [stepControl]="thirdFormGroup">
- <ng-template matStepLabel>Save in Database</ng-template>
- <app-save-resource></app-save-resource>
- <div>
- <button mat-button matStepperNext style="color:white;background:gray">Save</button>
- </div>
+ <ng-template matStepLabel>Resource Edit</ng-template>
+ <app-resource-edit></app-resource-edit><br>
</mat-step>
</mat-horizontal-stepper>
</mat-card-content>
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
index cafd2bf8f..9e4219a4c 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.scss
@@ -16,4 +16,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
-*/ \ No newline at end of file
+*/
+
+.mat-card {
+ padding: 0px !important;
+}
+
+.matStepNextBtn{
+ color:white;
+ background:gray;
+ margin-top: 10px;
+ position: absolute;
+ margin-bottom: 5px;
+} \ No newline at end of file