From 1c0e11d0e8221eedbc86577501d5fd40d4890d7e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 21 Feb 2020 11:34:03 +0000 Subject: [PATCH] USECASEUI-388 fixed and with additional changes Fixed i18Resource, subtittle wrap and directive folder Path. Alos added few changes for adapting multiple templates. Change-Id: Ie64485d24d11bcfd59be6c3c119dbccbc6c9b499 Issue-ID: USECASEUI-388 Signed-off-by: root --- usecaseui-portal/src/app/app.module.ts | 2 +- .../Directives/disable-control.directive.ts | 0 .../mdons-creation/mdons-creation.component.html | 21 ++-- .../mdons-creation/mdons-creation.component.ts | 48 ++++++-- .../mdons-detail/mdons-detail.component.ts | 121 +++++++++++++++++++- .../services-list/services-list.component.less | 4 +- .../services-list/top-card/top-card.component.less | 4 +- usecaseui-portal/src/assets/i18n/cn.json | 123 +++++++++++---------- usecaseui-portal/src/assets/i18n/en.json | 122 ++++++++++---------- 9 files changed, 297 insertions(+), 148 deletions(-) rename usecaseui-portal/src/app/{ => core}/Directives/disable-control.directive.ts (100%) diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts index 9d14d8f9..5fa37be6 100644 --- a/usecaseui-portal/src/app/app.module.ts +++ b/usecaseui-portal/src/app/app.module.ts @@ -24,7 +24,7 @@ import { NZ_I18N, en_US } from 'ng-zorro-antd'; import { NgxEchartsModule } from 'ngx-echarts'; //Custom Directive -import { DisableControlDirective } from './Directives/disable-control.directive'; +import { DisableControlDirective } from './core/Directives/disable-control.directive'; import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; diff --git a/usecaseui-portal/src/app/Directives/disable-control.directive.ts b/usecaseui-portal/src/app/core/Directives/disable-control.directive.ts similarity index 100% rename from usecaseui-portal/src/app/Directives/disable-control.directive.ts rename to usecaseui-portal/src/app/core/Directives/disable-control.directive.ts diff --git a/usecaseui-portal/src/app/views/services/services-list/mdons-creation/mdons-creation.component.html b/usecaseui-portal/src/app/views/services/services-list/mdons-creation/mdons-creation.component.html index 47e22fe9..a3dec5aa 100644 --- a/usecaseui-portal/src/app/views/services/services-list/mdons-creation/mdons-creation.component.html +++ b/usecaseui-portal/src/app/views/services/services-list/mdons-creation/mdons-creation.component.html @@ -19,21 +19,26 @@
  • * {{parameter.name}}: - + Required - - -