aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuji <lu.ji3@zte.com.cn>2016-09-22 11:16:06 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-09-22 11:16:06 +0000
commitd6715fd5e98b3c5ea0f2a2877746c949611f85a8 (patch)
tree1a6c861d84cbfadf4ced8f2747e14ce4e9f16d6e
parent8d076412ae9d2e8131c99c6191c6bbed40b9f2d8 (diff)
parent61c0002155c619336d87f712873aedc56a498af7 (diff)
Merge "Modify license. Issue-id:TOSCA-73"
-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
33 files changed, 105 insertions, 66 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">