Readd "Orchestrator" menu, and it's submenu.

Change-Id: I85623a372652a211155fe5e68409e97247964314
Issue-id:GSO-14
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

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 478289f..c7383af 100644 (file)
--- 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=包导入失败。\r
 nfv-package-iui-message-delete-confirm=确定要删除当前包？\r
 nfv-package-iui-message-delete-success=包删除成功。\r
-nfv-package-iui-message-upload-csar-exist=å\8c\85å·²ç»\8få­\98å\9c¨ï¼\8cæ\98¯å\90¦é\87\8dæ\96°上传？\r
+nfv-package-iui-message-upload-csar-exist=å­\98å\9c¨å\90\8cå\90\8då\8c\85ï¼\8cæ\98¯å\90¦ç»§ç»­上传？\r
 nfv-package-iui-message-upload-csar-deletionpending=实例中引用了此包，是否重新上传？\r
 nfv-package-iui-message-onBoarded = 已经上载，无需再次上载。\r
 nfv-package-iui-message-onBoard-error = 上载失败。\r

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 8816e93..ae0f6f7 100644 (file)
--- 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",