From ae3a13b740237fbb72fd3a971726936ccd4e785e Mon Sep 17 00:00:00 2001
From: nancylizi <li.zi30@zte.com.cn>
Date: Mon, 17 Oct 2016 11:44:08 +0800
Subject: [PATCH] Readd "Orchestrator" menu, and it's submenu.

Change-Id: I85623a372652a211155fe5e68409e97247964314
Issue-id:GSO-14
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
---
 .../catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties |  2 +-
 .../src/main/webapp/common/json/menu_list.json     | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

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 478289f9..c7383af9 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
@@ -81,7 +81,7 @@ nfv-package-iui-message-upload-success=包导入成功。
 nfv-package-iui-message-upload-fail=包导入失败。
 nfv-package-iui-message-delete-confirm=确定要删除当前包？
 nfv-package-iui-message-delete-success=包删除成功。
-nfv-package-iui-message-upload-csar-exist=包已经存在，是否重新上传？
+nfv-package-iui-message-upload-csar-exist=存在同名包，是否继续上传？
 nfv-package-iui-message-upload-csar-deletionpending=实例中引用了此包，是否重新上传？
 nfv-package-iui-message-onBoarded = 已经上载，无需再次上载。
 nfv-package-iui-message-onBoard-error = 上载失败。
diff --git a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
index 8816e939..ae0f6f7b 100644
--- a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
+++ b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
@@ -15,6 +15,11 @@
 			"url":"",
 			"iconClass":"fa fa-puzzle-piece"
 		},
+		{
+			"id":"openo_menu_orchestrator",
+			"url":"",
+			"iconClass":"fa fa-folder-open-o"
+		},
 		{
 			"id":"openo_menu_manage_view",
 			"url":"",
@@ -46,6 +51,24 @@
 			"url":"../user/user.html",
 			"iconClass":"fa fa-puzzle-piece"
 		},
+		{
+			"parentId":"openo_menu_orchestrator",
+			"id":"openo_menu_orchestrator_model_design",
+			"url":"/winery/servicetemplates.html",
+			"iconClass":"fa fa-folder-open-o"
+		},
+		{
+			"parentId":"openo_menu_orchestrator",
+			"id":"openo_menu_orchestrator_package",
+			"url":"../catalog/csarPackage.html",
+			"iconClass":"fa fa-folder-open-o"
+		},
+		{
+			"parentId":"openo_menu_orchestrator",
+			"id":"openo_menu_orchestrator_service_template",
+			"url":"../catalog/template.html",
+			"iconClass":"fa fa-list-alt"
+		},
 		{
 			"parentId":"openo_menu_manage_view",
 			"id":"openo_menu_manage_view_vim_manage",
-- 
2.16.6