aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openo-portal/portal-catalog/pom.xml3
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css5
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js16
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js7
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/template.html3
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html3
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/topology.html2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html3
-rw-r--r--openo-portal/portal-extsys/pom.xml4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css15
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js6
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties2
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties3
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html54
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html56
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties2
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties2
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js15
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js15
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js4
-rw-r--r--openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html34
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js191
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html75
62 files changed, 528 insertions, 177 deletions
diff --git a/openo-portal/portal-catalog/pom.xml b/openo-portal/portal-catalog/pom.xml
index c49813b0..6a647b03 100644
--- a/openo-portal/portal-catalog/pom.xml
+++ b/openo-portal/portal-catalog/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
limitations under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index 501b9126..7f1a44f7 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css
index 09af1d0d..ed9847ad 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/datatable-sort.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
table.table thead .sorting,
table.table thead .sorting_asc,
table.table thead .sorting_desc,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css
index 220b5172..14246da4 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/fileupload.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
@charset "UTF-8";
.file-caption {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css
index 2f99e682..a63d3bc1 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/hostMirror.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
index 9ff4aefa..94ea2e94 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css
index 5fb20898..cf2cbaf5 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/animate.min.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
@charset "UTF-8";/*!
Animate.css - http://daneden.me/animate
Licensed under the MIT license - http://opensource.org/licenses/MIT
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css
index 4beeda78..7f980e97 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/platform/skill.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: 'Open Sans', sans-serif;
background-color: #f1f3fa;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css
index ea561efc..2068df92 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/software.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css
index ba7a9889..09b6ae62 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/template.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css
index bc048e69..7314f5db 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/templateDetail.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css
index a4e1d3dd..1e0d8777 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/topology.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
.container-fluid {
background-color: #fff;
padding: 0;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css
index 38ae6202..3ec06815 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/virtualApplication.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css
index a3848f67..66348da0 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/vnfm.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
body {
font-family: microsoft yahei !important;
}
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
index ced9a839..d066da43 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
index d7ee3428..1e33352b 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js
index d49d2234..e667450f 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/loadi18n_nsoc.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
function loadPropertiesSideMenu(lang, fileNamePrefix, filePath){
jQuery.i18n.properties({
language:lang,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js
index 5a7b3901..cfa4a990 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/component/serverPageTable.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var serverPageTable = {};
/* Bootstrap style full number pagination control */
$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
index 7011a650..4a971218 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
index 610eb2ef..992357d0 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var pmUtil = {};
pmUtil.changeStatus = function(csarId, status) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js
index a6027bf5..bea04e3f 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
avalon.config({
interpolate: ["<!--", "-->"]
});
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
index 0d04e7cc..834562a6 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
index 40980c05..8e54ef3a 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmDetailUtil = {};
tmDetailUtil.timer = null;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
index a25b10cd..d717c780 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
index b5f7dab3..ca71ce44 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmNodesDetailUtil = {};
tmNodesDetailUtil.timer = null;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
index bcae3abf..8395b715 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
index b0137b0c..d15db04d 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmUtil = {};
tmUtil.nameRender = function(obj) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
index 8e0b850b..a531278a 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var topoUtil = {};
topoUtil.topoDatas=[];
topoUtil.svgOffsetWidth = 0;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
index dfb771c8..9ef2e428 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html
index 8a80c24b..1b159cd8 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
limitations under the License.
-->
+
<!DOCTYPE html>
<html>
<head>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
index 856a3bb4..d5563541 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
limitations under the License.
-->
+
<!DOCTYPE html>
<html>
<head>
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
index 661ae238..ceff55bf 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html
index 5a905b64..e5398572 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
limitations under the License.
-->
+
<html>
<head>
<head lang="en">
diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml
index 4c68273c..8832e0db 100644
--- a/openo-portal/portal-extsys/pom.xml
+++ b/openo-portal/portal-extsys/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
index 0193ce71..6e700545 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
index 092c7be4..f1882653 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
index 72de455e..ab7b8750 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
index 842ff486..0af68c56 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
body {
color: #333;
font-family: "Microsoft yahei", Verdana, Arial, Helvetica, sans-serif !important;
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
index 4f188705..5549e5b3 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
@@ -1,11 +1,11 @@
-*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/*
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
index 35cdb638..8a7e6379 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
index eeba6727..d2c5e9f3 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
# limitations under the License.
#
+
############## vimView.html i18n ##############
com_zte_ums_eco_roc_vim_checking_status=vim连接状态检查中...
com_zte_ums_eco_roc_vim_name=名称
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
index 660cd6f7..5f9a5dc0 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
index e590a099..d57e07d2 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
index 5e3c9c96..0ffa6d35 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
index 259f83df..284c1436 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
index 1e9126b9..417815d0 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
index ccade47c..e854a611 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
index bab4f3b2..103482f7 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
index 1bb1373e..e94066f8 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
@@ -1,31 +1,31 @@
<!DOCTYPE html>
<!--
-Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head lang="en">
<meta charset="UTF-8">
<title></title>
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
-<link href="../framework/css/ngict-component.css" rel="stylesheet" type="text/css">
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">
-<link href="../vendor/animate/animate.min.css" rel="stylesheet" type="text/css" />
-<link href="./css/vimChart.css" rel="stylesheet" type="text/css"/>
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+<link href="../../common/css/ngict-component.css" rel="stylesheet" type="text/css">
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">
+<link href="../../common/thirdparty/animate/animate.min.css" rel="stylesheet" type="text/css" />
+<link href="css/vimChart.css" rel="stylesheet" type="text/css"/>
<style>
.ms-controller {
visibility: hidden
@@ -97,17 +97,17 @@ var id,name,tenant;
</div>
-<script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
-<script type="text/javascript" src="../framework/js/tools.js"></script>
-<script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>
-<script src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../common/js/tools.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
<script type="text/javascript" src="./i18n/loadi18nApp.js"></script>
-<script src="../vendor/echarts/echarts-all.js"></script>
-<script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>
-<script src="../vendor/avalon/avalon.js"></script>
-<script type="text/javascript" src="./js/vimChart.js"></script>
-<script type="text/javascript" src="./js/vimChartController.js"></script>
-<script type="text/javascript" src="../framework/js/core/hk.min.js" ></script>
+<script src="../../common/thirdparty/echarts/echarts-all.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>
+<script src="../../common/thirdparty/avalon/avalon.js"></script>
+<script type="text/javascript" src="js/vimChart.js"></script>
+<script type="text/javascript" src="js/vimChartController.js"></script>
+<script type="text/javascript" src="../../common/js/core/hk.min.js" ></script>
</body>
</html> \ No newline at end of file
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
index b638cace..858d6d54 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
@@ -1,33 +1,33 @@
<!DOCTYPE html>
<!--
-Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<html>
<head lang="en">
<meta charset="UTF-8">
<title></title>
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
-<link href="../component/thirdparty/uniform/css/uniform.default.css" rel="stylesheet"/>
-<link href="../framework/css/ngict-component.css" rel="stylesheet" type="text/css">
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">
-<link href="./css/vim.css" rel="stylesheet" type="text/css"/>
-<link href="./css/skill.css" rel="stylesheet" type="text/css"/>
-<link href="../vendor/animate/animate.min.css" rel="stylesheet" type="text/css"/>
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+<link href="../../common/thirdparty/uniform/css/uniform.default.css" rel="stylesheet"/>
+<link href="../../common/css/ngict-component.css" rel="stylesheet" type="text/css">
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">
+<link href="css/vim.css" rel="stylesheet" type="text/css"/>
+<link href="css/skill.css" rel="stylesheet" type="text/css"/>
+<link href="../../common/thirdparty/animate/animate.min.css" rel="stylesheet" type="text/css"/>
<style>
@@ -220,14 +220,14 @@ limitations under the License.
</div>
</div>
-<script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
-<script type="text/javascript" src="../framework/js/tools.js"></script>
-<script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../framework/js/json2.js"></script>
-<script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../component/thirdparty/jquery-validation/js/jquery.validate.js"></script>
-<script type="text/javascript" src="../component/thirdparty/jquery-validation/js/additional-methods.min.js"></script>
-<script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../common/js/tools.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
+<script type="text/javascript" src="../../common/js/json2.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/jquery.validate.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>
+<script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>
<!--<script type="text/javascript" src="../component/thirdparty/cometd/cometd.js"></script>-->
<!--<script type="text/javascript" src="../component/thirdparty/cometd/jquery/jquery.cometd.js"></script>-->
<script type="text/javascript" src="js/loadi18nApp.js"></script>
@@ -236,7 +236,7 @@ limitations under the License.
<script src="../vendor/avalon/avalon.js"></script>
<script type="text/javascript" src="js/vimUtil.js"></script>
<script type="text/javascript" src="js/vimController.js"></script>
-<script src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>
-<script type="text/javascript" src="../framework/js/core/hk.min.js" ></script>
+<script src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
+<script type="text/javascript" src="../../common/js/core/hk.min.js" ></script>
</body>
</html> \ No newline at end of file
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
index b007c1b9..b1a752ac 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
index c4b588b4..14254aac 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
@@ -1,11 +1,11 @@
/**
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
index 6a1f354a..aed3e347 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
index 39ed4734..e98df6e4 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
index abc4cd63..2e3dffda 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
index c809aa26..198960ce 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 [ZTE] and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
function loadPropertiesSideMenu(lang, fileNamePrefix, filePath){
jQuery.i18n.properties({
language:lang,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
index ff99b9dd..04121018 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 [ZTE] and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
$(function(){
var form = $('#vnfm_form');
var error = $('.alert-danger', form);
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
index 8e1f8ac9..fcc95a6e 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
index fc3fe17f..7438cf13 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2016 [ZTE] and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
index 75bb025b..6256a8d1 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ Copyright 2016 [ZTE] and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
<head lang="en">
<meta charset="UTF-8">
<title></title>
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-<link href="../component/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet" />
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet"/>
-<link href="../framework/css/ngict-component.css" rel="stylesheet"/>
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+<link href="../../common/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet" />
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet"/>
+<link href="../../common/css/ngict-component.css" rel="stylesheet"/>
<link href="css/animate.min.css" rel="stylesheet"/>
<link href="css/vnfm.css" rel="stylesheet" />
<style>
@@ -198,19 +198,19 @@
</div>
</div>
</div>
- <script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
- <script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
- <script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>
- <script type="text/javascript" src="../component/thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
- <script type="text/javascript" src="../component/thirdparty/jquery-validation/js/additional-methods.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>
- <script type="text/javascript" src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>
- <script type="text/javascript" src="../vendor/cometd/cometd.js"></script>
- <script type="text/javascript" src="../vendor/cometd/jquery.cometd.js"></script>
- <script type="text/javascript" src="../vendor/avalon/avalon.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/cometd/cometd.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/cometd/jquery.cometd.js"></script>
+ <script type="text/javascript" src="../../common/thirdparty/avalon/avalon.js"></script>
- <script type="text/javascript" src="../framework/js/tools.js"></script>
+ <script type="text/javascript" src="../../common/js/tools.js"></script>
<script type="text/javascript" src="js/commonUtil.js"></script>
<script type="text/javascript" src="js/loadi18n_nsoc.js"></script>
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js
new file mode 100644
index 00000000..7da69471
--- /dev/null
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/tmNodesController.js
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var vm = avalon.define({
+ $id : "tmNodesController",
+ instanceId : "",
+ $language: {
+ "sProcessing": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ +$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",
+ "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"),
+ "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"),
+ "sInfo": "<span class='seperator'> </span>" + $.i18n.prop("nfv-nso-iui-table-sInfo"),
+ "sInfoEmpty": $.i18n.prop("nfv-nso-iui-table-sInfoEmpty"),
+ "sGroupActions": $.i18n.prop("nfv-nso-iui-table-sGroupActions"),
+ "sAjaxRequestGeneralError":$.i18n.prop("nfv-nso-iui-table-sAjaxRequestGeneralError"),
+ "sEmptyTable": $.i18n.prop("nfv-nso-iui-table-sEmptyTable"),
+ "oPaginate": {
+ "sPrevious": $.i18n.prop("nfv-nso-iui-table-sPrevious"),
+ "sNext": $.i18n.prop("nfv-nso-iui-table-sNext"),
+ "sPage": $.i18n.prop("nfv-nso-iui-table-sPage"),
+ "sPageOf": $.i18n.prop("nfv-nso-iui-table-sPageOf")
+ }
+ },
+ $restUrl : {
+ queryNodeInstanceUrl : "/openoapi/nslcm/v1.0/ns/"
+ },
+ $init : function() {
+ vm.$initInstanceData();
+ },
+ $initInstanceData : function() {
+ $.ajax({
+ type : "GET",
+ url : vm.$restUrl.queryNodeInstanceUrl,
+ success : function(resp) {
+ if(resp) {
+ vm.servicesInstanceData = [
+ resp.nsName,
+ resp.description,
+ resp.nsdId,
+ resp.nsState
+ ];
+ var tableData = [
+ [resp.vnfInfoId],
+ [resp.vlInfo.vldId],
+ [resp.vnffgInfo.vnffgInstanceId]
+ ];
+ vm.$initNfvNodesTab();
+ vm.nodesList.nodesData = tableData;
+ vm.nodesList.$initNodesTable();
+ }
+ },
+ error : function() {
+ commonUtil.showMessage($.i18n.prop("nfv-topology-iui-message-error"), "danger");
+ }
+ });
+ },
+ servicesInstanceData: [],
+ $nodesTabId : "ict_nodes_template_table",
+ $nodesInstanceTabFields : {// table columns
+ table: [
+ {"mData": "serviceInstanceId", name: "ID","bVisible": false},
+ {"mData": "", name: "","sClass": 'details-control'},
+ {"mData": "serviceName", name: "Service Name"},
+ {"mData": "serviceDescription", name: "Service Description"},
+ {"mData": "nsdId", name: "NSD ID"},
+ {"mData":"status", name: "Status"}
+ ]
+ },
+ $initNfvNodesTab: function() {
+ var setting = {};
+ setting.language = vm.$language;
+ setting.paginate = true;
+ setting.info = true;
+ setting.columns = vm.$nodesInstanceTabFields.table;
+ setting.tableId = vm.$nodesTabId;
+ vm.$initDataTable(setting,vm.$nodesTabId + '_div', vm.servicesInstanceData);
+ $('#' + vm.$nodesTabId + '>tbody').on("click", 'td.details-control', function () {
+ var tr = $(this).closest('tr');
+ var table = $('#' + vm.$nodesTabId).dataTable();
+ if (table.fnIsOpen(tr[0])) {
+ table.fnClose(tr[0]);
+ tr.removeClass('shown');
+ }
+ else {
+ table.fnOpen(tr[0], vm.nodesList.$format_Detail(), 'details');
+ tr.addClass('shown');
+ }
+ });
+ },
+
+ $initDataTable : function( setting, divId, tableData) {
+ //transform colomn
+ var column = setting.columns;
+ //empty table
+ $('#'+ divId).children().remove();
+ var tableId = setting.tableId;
+ var tableEleStr = '<table class="table table-striped table-bordered table-hover" id= '+ tableId + '>'
+ + '<thead>'
+ +'<tr role="row" class="heading" >'
+ + '</tr>'
+ + '</thead>'
+ +'<tbody>'
+ +'</tbody>'
+ +'</table>';
+ $('#'+ divId).append(tableEleStr);
+ //$('#'+ tableId).append(' <thead><tr role="row" class="heading" ></tr></thead><tbody></tbody>');
+ var trEle = $('#'+ tableId + ' > thead >tr');
+ //var dataTableColumn = [];
+ for ( var one in column){
+ var th = '<th>' + column[one].name + '</th>';
+ trEle.append(th);
+ }
+ var table = $("#" + tableId).dataTable({
+ //"sDom" : "tr<'row'<'col-md-6 col-sm-12'><'col-md-6 col-sm-12'pli>>", // datatable layout
+ //"sDom" : "<'row'<'col-md-12 col-sm-12'lip>r><'table-scrollable't>>",
+ "sDom": '<"top"rt><"bottom"lip>',
+ "oLanguage": setting.language,//language
+ //"bJQueryUI": true,
+ "bPaginate": setting.paginate,// page button
+ "bFilter": false,// search bar
+ "bAutoWidth":true,//automatically set colum width
+ "bLengthChange": true,// record number in each row
+ "iDisplayLength": 10,// row number in each page
+ "bSort": setting.sort ? true : false,// sort
+ "bInfo": setting.info,// Showing 1 to 10 of 23 entries
+ "bWidth": true,
+ "bScrollCollapse": true,
+ "sPaginationType": "bootstrap_extended", // page, a total of two kinds of style, another one is two_button
+ "bProcessing": true,
+ "bServerSide": false,
+ "bDestroy": true,
+ "bSortCellsTop": true,
+ "aoColumns": setting.columns,
+ "aoColumnDefs": [
+ {
+ sDefaultContent: '',
+ aTargets: [ '_all' ]
+ }
+ ],
+ "aaData": tableData
+ });
+ };
+
+ //nodes list table
+ nodesList :{
+ nodesData: [],
+ $nodesTabDataId : "ict_nodes_table",
+ $nodesTabFields : {// table columns
+ table: [
+ {"mData": "id", name: "ID", "bVisible": false},
+ {"mData": "instanceId", name: "Instance Id"}
+ ]
+ },
+ $initNodesTable: function () {
+ var setting = {};
+ setting.language = vm.$language;
+ setting.paginate = true;
+ setting.info = true;
+ setting.columns = vm.nodesList.$nodesTabFields.table;
+ setting.tableId = vm.nodesList.$nodesTabDataId;
+ vm.$initDataTable(setting,vm.nodesList.$nodesTabDataId + '_div', vm.nodesList.nodesData);
+ }
+ }
+});
+
+var initParam = function() { //initialize template detail params
+ var paramStr = window.location.search.substring(1);
+ if(paramStr.length > 0) {
+ avalon.scan();
+ var params = paramStr.split("&");
+ var instanceId = params[0].substring(params[0].indexOf('=') + 1);
+
+ vm.instanceId = instanceId;
+ vm.$restUrl.queryNodeInstanceUrl = commonUtil.format(vm.$restUrl.queryNodeInstanceUrl, instanceId);
+ vm.$init();
+ }
+};
+initParam(); \ No newline at end of file
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html
new file mode 100644
index 00000000..b09ae008
--- /dev/null
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/lcm_detail_nfvo_nodesinfo.html
@@ -0,0 +1,75 @@
+<!--
+
+ Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<html>
+<head>
+ <head lang="en">
+ <meta charset="UTF-8">
+ <title></title>
+ <link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+ <link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+ <link href="../component/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet" />
+ <link href="../component/css/ZteIctIcons/style.css" rel="stylesheet"/>
+ <link href="../framework/css/ngict-component.css" rel="stylesheet"/>
+ <link href="../framework/css/plugins.css" rel="stylesheet"/>
+ <link href="css/platform/animate.min.css" rel="stylesheet"/>
+ <link href="css/datatable-sort.css" rel="stylesheet"/>
+ <link href="css/templateDetail.css" rel="stylesheet" />
+ <link href="css/topology.css" rel="stylesheet" />
+ <style type="text/css">
+ .ms-controller {
+ visibility: hidden;
+ }
+ .ms-nodedetail {
+ display: none;
+ }
+ </style>
+ </head>
+<body>
+ <div ms-controller="tmNodesController" class="container-fluid ms-controller">
+ <div class="row">
+ <div class="col-xs-6 col-md-6 col-sm-6 col-lg-6 titlefont">
+ <span id="nfv-template-nodes-iui-title" name_i18n="com_zte_nfv_nsoc_i18n"></span>
+ </div>
+ </div>
+ <div class="separator-line"></div>
+ <div class="row-fluid" data-name="table_zone">
+ <div class="col-xs-12" id='ict_nodes_template_table_div'></div>
+ </div>
+
+ <script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+ <script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="../component/thirdparty/data-tables/jquery.dataTables.js"></script>
+ <script type="text/javascript" src="../component/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
+
+ <script type="text/javascript" src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>
+ <script type="text/javascript" src="../vendor/avalon/avalon.modern.js"></script>
+
+ <script type="text/javascript" src="../framework/js/tools.js"></script>
+
+ <script type="text/javascript" src="js/component/commonUtil.js"></script>
+ <script type="text/javascript" src="js/component/serverPageTable.js"></script>
+ <script type="text/javascript" src="js/component/loadi18n_nsoc.js"></script>
+
+ <script type="text/javascript" src="js/template/tmNodesDetailUtil.js"></script>
+ <script type="text/javascript" src="js/template/tmUtil.js"></script>
+ <script type="text/javascript" src="js/tmNodesController.js"></script>
+ <script type="text/javascript" src="js/template/topoUtil.js"></script>
+ </div>
+</body>
+</html> \ No newline at end of file