From bed34b02106cb0cbfc1584a134384c098c6acfbf Mon Sep 17 00:00:00 2001 From: "anjali.walsatwar" Date: Thu, 8 Aug 2019 11:56:11 +0530 Subject: date based comments removed date based comments removed Issue-ID: USECASEUI-303 Signed-off-by: anjali.walsatwar Change-Id: I56c4b05a8fe98419c122d1d0257cf118fd15929d --- .../ccvpn-creation/ccvpn-creation.component.css | 43 ++--- .../app/ccvpn-detail/ccvpn-detail.component.css | 15 +- .../e2e-creation/e2e-creation.component.html | 205 ++++++++++----------- .../e2e-creation/e2e-creation.component.less | 6 +- .../e2e-detail/e2e-detail.component.html | 28 +-- .../e2e-detail/e2e-detail.component.less | 7 +- usecaseui-portal/src/app/homes.service.ts | 4 +- .../services-list/services-list.component.html | 6 +- .../services-list/services-list.component.less | 29 +-- usecaseui-portal/src/styles.less | 15 +- 10 files changed, 147 insertions(+), 211 deletions(-) (limited to 'usecaseui-portal') diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css index 23ea9d7a..81b727c8 100644 --- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css +++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.css @@ -25,14 +25,13 @@ hr { margin-bottom: 10px; } .model { - background-color: #F7F8FC; - /*height: 100%;*/ + background-color: #F7F8FC; overflow-y: auto; } .creation-model{ position: relative; } -.top-title{ /*2019.01.22 add*/ +.top-title{ width: 100%; padding: 20px; position: relative; @@ -49,8 +48,7 @@ hr { background-size: 100%!important; border-radius:4px; color: #D7D7D7; - cursor: pointer; - /*border: 1px solid #ffffff;*/ + cursor: pointer; } .model .back:hover{ background: url("../../assets/images/Return-icon-active.png")!important; @@ -63,8 +61,7 @@ hr { font-family:ArialMT; color:#3C4F8C; line-height:35px; - display: inline-block; - /*top:10px;*/ + display: inline-block; } .model .submit{ @@ -75,20 +72,17 @@ hr { right: 85px; color: #fff; font-size: 18px; - background:#0DA9E2; - /*background:linear-gradient(90deg,rgba(99,194,246,1) 0%,rgba(62,155,255,1) 100%) !important;*/ + background:#0DA9E2; border-radius:4px; border: none!important; border-color:rgba(0,0,0,0)!important; } .model .submit:hover{ - background:#09C6E2; - /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/ + background:#09C6E2; border: none; } .model .creation { - width: 100%; - /*height: 60vh;*/ + width: 100%; overflow-y: auto; border-radius: 5px; padding: 15px; @@ -138,9 +132,7 @@ hr { left: 50px; top: 60px; background-color: #fff; - /*box-shadow: 0px 0px 20px #000;*/ - width:1500px; - /*width:1300px;px*/ + width:1500px; height: 81%; border-radius:2px; overflow:auto; @@ -158,11 +150,8 @@ hr { line-height: 35px; font-size: 18px; font-weight: 500; - margin: 10px auto; - /*padding-left: 10px;*/ - color: #06A7E2; - /*color: #ffffff;*/ - /*background:linear-gradient(90deg,rgba(7,169,225,1) 0%,rgba(48,217,196,1) 100%);*/ + margin: 10px auto; + color: #06A7E2; border-bottom: 2px solid; border-image: -webkit-linear-gradient(#07A9E1,#30D9C4) 100 100; border-image: -moz-linear-gradient(#07A9E1,#30D9C4) 100 100; @@ -221,13 +210,11 @@ hr { font-size: 16px; margin: 0 15px; } -.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){ - /*background:linear-gradient(310deg,rgba(30,158,255,1) 0%,rgba(99,200,255,1) 100%);*/ +.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){ background: #0DA9E2; color: #fff; } -.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{ - /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/ +.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{ background:#09C6E2; } @@ -279,15 +266,13 @@ hr { /* chart */ .model .chart { width: 98%; - padding: 10px; - /*height: 30vh;*/ + padding: 10px; margin: 0 auto; color: #06A7E2; font-size: 16px; font-weight: 500; margin-bottom: 30px; - background: #EEF9FF; - /*background:linear-gradient(180deg,rgba(183, 230, 247, 1) 0%,rgba(214, 240, 254, 1) 100%);*/ + background: #EEF9FF; border-radius:4px; } .model .chart #createChart { diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css index 704b2eb2..d489dd8b 100644 --- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css +++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.css @@ -26,14 +26,13 @@ hr { } .model { background-color: #F7F8FC; - /*height: 100%;*/ overflow-y: auto; } .creation-model{ position: relative; height: 100%; } -.top-title{ /*2019.02.22 add*/ +.top-title{ width: 100%; padding: 20px; position: relative; @@ -64,7 +63,6 @@ hr { border-radius:4px; color: #D7D7D7; cursor: pointer; - /*border: 1px solid #ffffff;*/ } .model .back:hover{ background: url("../../assets/images/Return-icon-active.png")!important; @@ -175,9 +173,7 @@ hr { left: 50px; top: 60px; background-color: #fff; - /*box-shadow: 0px 0px 20px #000;*/ width:1500px; - /*width:1300px;px*/ height: 81%; border-radius:2px; overflow:auto; @@ -196,10 +192,7 @@ hr { font-size: 18px; font-weight: 500; margin: 10px auto; - /*padding-left: 10px;*/ color: #06A7E2; - /*color: #ffffff;*/ - /*background:linear-gradient(90deg,rgba(7,169,225,1) 0%,rgba(48,217,196,1) 100%);*/ border-bottom: 2px solid; border-image: -webkit-linear-gradient(#07A9E1,#30D9C4) 100 100; border-image: -moz-linear-gradient(#07A9E1,#30D9C4) 100 100; @@ -258,13 +251,11 @@ hr { font-size: 16px; margin: 0 15px; } -.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){ - /*background:linear-gradient(310deg,rgba(30,158,255,1) 0%,rgba(99,200,255,1) 100%);*/ +.model .sitemodel .action button:nth-child(2),.model .sotnnpnmodel .action button:nth-child(2){ background: #0DA9E2; color: #fff; } -.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{ - /*background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;*/ +.model .sitemodel .action button:nth-child(2):hover,.model .sotnnpnmodel .action button:nth-child(2):hover{ background:#09C6E2; } diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html index 5e9f8158..da673bf0 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html @@ -15,132 +15,125 @@ -->
- +
-

{{createParams.commonParams.templateType}} {{"i18nTextDefine_InstanceCreation" | translate}}

+

{{createParams.commonParams.templateType}} {{"i18nTextDefine_InstanceCreation" | translate}}

- +
-
-
- -
+
+
+

{{"i18nTextDefine_Base" | translate}}

-
    -
  • Name:
    • -
  • Description:
    • -
  • COS:
    • -
  • EBS:
    • -
-
-
+
    +
  • + Name: + +
    • +
  • + Description: + +
    • +
  • + COS: + +
    • +
  • + EBS: + +
    • +
+
+

{{"i18nTextDefine_templateInputs" | translate}}

-
    -
  • - {{parameter.name}}: - - -
    id: - {{parameter.name}}
    - vf_location: - - - - -
    • -
-
-
-

{{template.name}}

-
    -
  • - {{input.name}}: - +
      +
    • + {{parameter.name}}: + -
      id: {{input.name}}
      - vf_location: - - - +
      id: {{parameter.name}} +
      + vf_location: + + + +
      • +
    +
+
+

{{template.name}}

+
    +
  • + {{input.name}}: + - - - - - -
    • -
+
id: {{input.name}}
+ vf_location: + + + + + +
-
-
-
+
+

{{"i18nTextDefine_Base" | translate}}

-
    -
  • Name:
    • -
  • Description:
    • -
-
-
+
    +
  • + Name: + +
    • +
  • + Description: + +
    • +
+
+

{{"i18nTextDefine_templateInputs" | translate}}

-
    -
  • - {{parameter.name}}: - +
      +
    • + {{parameter.name}}: + -
      id: - {{parameter.name}}
      - vf_location: - - - - -
      • -
    -
-
+
id: {{parameter.name}} +
+ vf_location: + + + + + +
+

vnfs Inputs

-
    -
  • -
    id: {{vnf.vnf_id}}
    - vf_location: - - - -
    • -
+
    +
  • +
    id: {{vnf.vnf_id}}
    + vf_location: + + + +
    • +
+
-
- -
-
- - - - - - - + +
+
+ +
-
- +
\ No newline at end of file diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less index 22c12fb7..35b91799 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less @@ -29,7 +29,7 @@ hr { height: 100%; overflow-y: auto; position: relative; - .top-title{ /*2019.01.22 add*/ + .top-title{ width: 100%; padding: 20px; position: relative; @@ -64,7 +64,6 @@ hr { border-radius:4px; color: #D7D7D7; cursor: pointer; - /*border: 1px solid #ffffff;*/ } .back:hover{ background: url("../../../assets/images/Return-icon-active.png")!important; @@ -78,8 +77,6 @@ hr { color:#3C4F8C; line-height:35px; display: inline-block; - /*top:10px;*/ - } .e2ecreate-content{ position: relative; @@ -134,7 +131,6 @@ hr { font: 700 14px "Arial"; vertical-align: middle; overflow: hidden; - //text-overflow: ellipsis; text-align: left; } input,nz-select{ diff --git a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html index 29ac4194..c0953a90 100644 --- a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html +++ b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.html @@ -24,12 +24,17 @@
-

{{"i18nTextDefine_Base" | translate}}

    -
  • Name: {{service.name}}
    • -
  • Description:{{service.description}}
    • +
  • + Name: + {{service.name}} +
    • +
  • + Description: + {{service.description}} +
@@ -56,8 +61,14 @@

{{"i18nTextDefine_Base" | translate}}

    -
  • Name: {{ns_service.name}}
    • -
  • Description:{{ns_service.description}}
    • +
  • + Name: + {{ns_service.name}} +
    • +
  • + Description: + {{ns_service.description}} +
@@ -86,13 +97,8 @@
- - - - -
-
+
\ No newline at end of file diff --git a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less index bba5160f..3f03af34 100644 --- a/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less +++ b/usecaseui-portal/src/app/components/e2e-detail/e2e-detail.component.less @@ -32,7 +32,7 @@ hr { height: 100%; overflow-y: auto; position: relative; - .top-title{ /*2019.01.22 add*/ + .top-title{ width: 100%; padding: 20px; position: relative; @@ -50,7 +50,6 @@ hr { border-radius:4px; color: #D7D7D7; cursor: pointer; - /*border: 1px solid #ffffff;*/ } .back:hover{ background: url("../../../assets/images/Return-icon-active.png")!important; @@ -64,8 +63,6 @@ hr { color:#3C4F8C; line-height:35px; display: inline-block; - /*top:10px;*/ - } .detaildata{ position: relative; @@ -103,7 +100,6 @@ hr { margin-left: 30px; } ul li { - // display: inline-block; margin: 10px 0; width: 49%; float: left; @@ -116,7 +112,6 @@ hr { font: 700 14px "Arial"; vertical-align: middle; overflow: hidden; - //text-overflow: ellipsis; text-align: left; color:rgba(60,79,140,0.5); } diff --git a/usecaseui-portal/src/app/homes.service.ts b/usecaseui-portal/src/app/homes.service.ts index 04b1199c..b9b9d5bf 100644 --- a/usecaseui-portal/src/app/homes.service.ts +++ b/usecaseui-portal/src/app/homes.service.ts @@ -120,11 +120,11 @@ export class HomesService { return this.http.get(httpurl); } - //2019.1.2 add listSortMasters + getListSortMasters(){ return this.http.get(this.url.listSortMasters); } - //2019.05.08 add + getCurrentLanguage(currentloginId){ let url=this.url.currentLanguage+currentloginId; return this.http.get(url); diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html index 969898a3..1370f4bf 100644 --- a/usecaseui-portal/src/app/services/services-list/services-list.component.html +++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html @@ -246,7 +246,7 @@
- +
@@ -309,7 +309,7 @@ [(ngModel)]="gracefulTerminationTimeout">
- +
@@ -408,7 +408,7 @@
- +
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.less b/usecaseui-portal/src/app/services/services-list/services-list.component.less index 7f23ac8b..fcb70b82 100644 --- a/usecaseui-portal/src/app/services/services-list/services-list.component.less +++ b/usecaseui-portal/src/app/services/services-list/services-list.component.less @@ -130,7 +130,6 @@ hr { } .create:hover{ background:#09C6E2; - //background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important; } } @@ -146,17 +145,14 @@ hr { float: left; background:url("../../../assets/images/servicelist-e2e.png") no-repeat; background-size: 100% 100%; - //background:linear-gradient(90deg,rgba(16,174,222,1) 0%,rgba(43,206,202,1) 100%); border-radius:2px; } .top-num .top-list:nth-child(2){ background:url("../../../assets/images/servicelist-e2e.png") no-repeat; - //background:url("../../../assets/images/servicelist-ns.png") no-repeat; background-size: 100% 100%; } .top-num .top-list:nth-child(3){ background:url("../../../assets/images/servicelist-e2e.png") no-repeat; - //background:url("../../../assets/images/servicelist-sotn.png") no-repeat; background-size: 100% 100%; } .top-num .top-list:nth-child(4){ @@ -333,7 +329,6 @@ hr { height: 100vh; background-color: #f3f3f3; overflow-y: auto; - //padding: 20px 32px; z-index: 3; } .createComponent { @@ -344,39 +339,19 @@ hr { height: 100vh; background-color: #F7F8FC; overflow-y: auto; - //padding: 20px 32px; z-index: 3; } -/*2019.01.14*/ + .e2eColor,.nsColor,.ccvpnColor,.sotnColor,.voLTEColor{ - //color: #3671AB; width:120px; height: 34px; line-height: 34px; margin-bottom: 0!important; text-align: center; background:rgba(158, 158, 158, 0.38); - //background:linear-gradient(131deg,rgba(147,196,255,1) 0%,rgba(120,241,226,1) 100%); border-radius:4px } -//.nsColor{ -// background:linear-gradient(135deg,rgba(253,187,127,1) 0%,rgba(250,215,153,1) 100%); -// border-radius:4px; -// color: #A16C39; -//} -//.ccvpnColor{ -// background:linear-gradient(135deg,rgba(198,222,251,1) 0%,rgba(217,215,252,1) 100%); -// border-radius:4px; -// color: #7C74BB; -//} -//.sotnColor{ -// background:rgba(201,243,239,1); -// border-radius:4px; -// color: #30B0A0; -//} -//.voLTEColor{ -// background:rgba(201,243,239,1); -//} + .vnfColor,.siteColor,.SDWANColor{ color:rgba(60,79,140,0.5); width:120px; diff --git a/usecaseui-portal/src/styles.less b/usecaseui-portal/src/styles.less index c78d7fcb..4e4ee690 100644 --- a/usecaseui-portal/src/styles.less +++ b/usecaseui-portal/src/styles.less @@ -275,7 +275,6 @@ nz-range-picker { } } -//2019.01.21 add services-list.component.html //creat nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-modal .nsdeleteModel.ant-modal, nz-modal .healModel.ant-modal, nz-modal .scaleModel.ant-modal{ @@ -344,7 +343,6 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod button:nth-child(1){ background:#EEEEEE; border-radius:2px; - //margin-left: 50px; margin-right: 10px; span{ color: #9DA7C5; @@ -352,7 +350,6 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } } button:nth-child(2){ - //background: linear-gradient(310deg, rgba(30, 158, 255, 1) 0%, rgba(99, 200, 255, 1) 100%); background:#0DA9E2; box-shadow:0px 0px 2px 0px rgba(14,90,218,1); border-radius:2px; @@ -365,12 +362,11 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } button:nth-child(2):hover { background:#09C6E2; - //background: linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important; } } } -//2019.01.25 add ccvpn-creation.component.html + .model .creation nz-tabset ,.model .detaildata nz-tabset{ box-shadow: 0px 10px 15px 2px rgba(222, 222, 222, 0.5); .ant-tabs-bar { @@ -472,7 +468,7 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } } } -//2019.01.29 add + .sitemodel nz-table,.siteDetail nz-table { .ant-table-wrapper{ width: 96%!important; @@ -527,7 +523,7 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } } -//2019.02.01 gong add + .list#services-list nz-table{ .ant-table-wrapper{ .ant-spin-container{ @@ -561,7 +557,7 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } } } -//gong 2019.04.12 add + .healModel{ .heal-question{ nz-select{ @@ -576,7 +572,7 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod } } -//gong 2019.04.15 services-list.component.html add + //deleteModel style nz-modal .deleteModel.ant-modal, nz-modal .nsdeleteModel.ant-modal, nz-modal .healModel.ant-modal, nz-modal .scaleModel.ant-modal { background: #ffffff; @@ -725,7 +721,6 @@ nz-modal .scaleModel.ant-modal { overflow: auto; } -//2019.05.09 add notification model nz-notification-container .ant-notification{ width: 592px!important; max-width: 592px!important; -- cgit 1.2.3-korg