From: huangjian <huang.jian12@zte.com.cn>
Date: Mon, 26 Sep 2016 07:03:45 +0000 (+0800)
Subject: Add menus(Catalog/ESR/ModelDesign)
X-Git-Tag: release/sun~158^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=84e9b4e7458dc4344c808ce1243578dc3074425d;p=vnfsdk%2Frefrepo.git

Add menus(Catalog/ESR/ModelDesign)

Change-Id: I99fc6c943f8ec2a03dd73bf0fb6209770f0bd058
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
---

diff --git a/openo-portal/portal-common/src/main/webapp/common/default.html b/openo-portal/portal-common/src/main/webapp/common/default.html
index 8c545aa4..49c8812d 100644
--- a/openo-portal/portal-common/src/main/webapp/common/default.html
+++ b/openo-portal/portal-common/src/main/webapp/common/default.html
@@ -523,7 +523,7 @@
 		<script>
 			loadi18n_WebFramework(); // 加载框架自身的国际化内容
 			iniHorMenu();            
-            iniSidebarMenu();
+            //iniSidebarMenu();
 			iniFMenu();			
 		</script>
 		<script type="text/javascript" src="./js/fm_light.js">
diff --git a/openo-portal/portal-common/src/main/webapp/common/js/menus/loadi18n-openo-menus.js b/openo-portal/portal-common/src/main/webapp/common/js/menus/loadi18n-openo-menus.js
new file mode 100644
index 00000000..2d6ac69e
--- /dev/null
+++ b/openo-portal/portal-common/src/main/webapp/common/js/menus/loadi18n-openo-menus.js
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 ZTE Corporation.
+ *
+ * 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 loadOpenoSideMenu(lang){
+    loadPropertiesSideMenu(lang, 'openo-menus-i18n', '/openoui/common/js/menus/');
+}
+loadOpenoSideMenu(lang);
\ No newline at end of file
diff --git a/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-en-US.properties b/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-en-US.properties
new file mode 100644
index 00000000..b869ad58
--- /dev/null
+++ b/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-en-US.properties
@@ -0,0 +1,30 @@
+#
+# Copyright 2016 ZTE Corporation.
+#
+# 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.
+#
+org_openo_menu_service=Service
+org_openo_menu_resource=Resource
+org_openo_menu_monitor=Monitor
+
+org_openo_menu_service_design=Service Design
+org_openo_menu_service_design_model_design=Model Design
+
+org_openo_menu_service_catalog=Service Catalog
+org_openo_menu_service_catalog_package=Package
+org_openo_menu_service_catalog_service_template=Service Template
+
+org_openo_menu_external_system_register=External System Register
+org_openo_menu_vim_register=VIM
+org_openo_menu_vnfm_register=VNFM
+org_openo_menu_sdn_controller_register=SDNC
diff --git a/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-zh-CN.properties b/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-zh-CN.properties
new file mode 100644
index 00000000..99b8bb4b
--- /dev/null
+++ b/openo-portal/portal-common/src/main/webapp/common/js/menus/openo-menus-i18n-zh-CN.properties
@@ -0,0 +1,15 @@
+#
+# Copyright 2016 ZTE Corporation.
+#
+# 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.
+#
diff --git a/openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html b/openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html
index f9e01b5e..2c11d222 100644
--- a/openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html
+++ b/openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html
@@ -14,10 +14,10 @@
     limitations under the License.
 -->
 <li class="mega-menu-dropdown">
-    <a href="/iui/umcdrill/monitorns.html" id="openo-nsoc" parentid="openo-nsoc" hparentid="openo-nsoc"
-    order="20.0" class="iframe" shiftjs="" cachenum="openo-nsoc" breadcrumgroupbuttonsrc=""
+    <a href="/openoui/catalog/csarPackage.html" id="openo-service" parentid="openo-service" hparentid="openo-service"
+    order="20.0" class="iframe" shiftjs="" cachenum="openo-service" breadcrumgroupbuttonsrc=""
     operation="" iframeautoscroll="auto" defaultdisplay="">
-        <span id="org_openo_orchestrator_nsoc_service" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_service" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -27,10 +27,10 @@
     </a>
 </li>
 <li class="mega-menu-dropdown">
-    <a href="/iui/rocvim/vimView.html" id="openo-roc" parentid="openo-roc" hparentid="openo-roc" 
-    order="30.0" class="iframe" shiftjs="" cachenum="openo-roc" breadcrumgroupbuttonsrc=""
+    <a href="/openoui/extsys/vim/vimView.html" id="openo-resource" parentid="openo-resource" hparentid="openo-resource" 
+    order="30.0" class="iframe" shiftjs="" cachenum="openo-resource" breadcrumgroupbuttonsrc=""
     operation="" iframeautoscroll="auto" defaultdisplay="">
-        <span id="org_openo_orchestrator_roc_resource" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_resource" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -40,10 +40,10 @@
     </a>
 </li>
 <li class="mega-menu-dropdown">
-    <a href="/iui/umcmonitor/monitorSettingList.html" id="openo-umc" parentid="openo-umc" hparentid="openo-umc"
-    order="40.0" class="iframe" shiftjs="" cachenum="openo-umc" breadcrumgroupbuttonsrc="" 
+    <a href="/openoui/umcmonitor/monitorSettingList.html" id="openo-monitor" parentid="openo-monitor" hparentid="openo-monitor"
+    order="40.0" class="iframe" shiftjs="" cachenum="openo-monitor" breadcrumgroupbuttonsrc="" 
     operation="" iframeautoscroll="auto" defaultdisplay="">
-        <span id="org_openo_orchestrator_umc_monitor" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_monitor" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -52,9 +52,5 @@
         </span>
     </a>
 </li>
-<script type="text/javascript" src="/iui/framework/hsif/openo-nsoc/i18n/loadi18n-openo-nsoc.js">
-</script>
-<script type="text/javascript" src="/iui/framework/hsif/openo-roc/i18n/loadi18n-openo-roc.js">
-</script>
-<script type="text/javascript" src="/iui/framework/hsif/openo-umc/i18n/loadi18n-openo-umc.js">
+<script type="text/javascript" src="/openoui/common/js/menus/loadi18n-openo-menus.js">
 </script>
\ No newline at end of file
diff --git a/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html b/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
index 0e17530c..b7dfcb98 100644
--- a/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
+++ b/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
@@ -14,10 +14,10 @@
     limitations under the License.
 -->
 <li>
-    <a href="javascript:;" id="col-openo-umc-monitor-service" hparentid="openo-nsoc">
-        <i class="fa fa-comments">
+    <a href="javascript:;" id="col-openo-service-design" hparentid="openo-service">
+        <i class="fa fa-folder-open-o">
         </i>
-        <span id="org_openo_orchestrator_umc_monitor_service" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_service_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -27,22 +27,22 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-umc-monitor-service-overview" parentid="openo-nsoc" hparentid="col-openo-umc-monitor-service"
+            <a class="iframe" id="openo-service-model-design" hparentid="col-openo-service-design"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcdrill/monitorns.html">
-                <i class="fa fa-comments">
+            href="/winery/servicetemplates.html">
+                <i class="fa fa-folder-open-o">
                 </i>
-                <span id="org_openo_orchestrator_umc_monitor_service_overview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_design_model_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
     </ul>
 </li>
 <li>
-    <a href="javascript:;" id="col-openo-nsoc-orchestrator" hparentid="openo-nsoc">
+    <a href="javascript:;" id="col-openo-service-catalog" hparentid="openo-service">
         <i class="fa fa-folder-open-o">
         </i>
-        <span id="org_openo_orchestrator_nsoc_orchestrator" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_service_catalog" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -52,72 +52,32 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-nsoc-model-design" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
+            <a class="iframe" id="openo-nsoc-vnfd" hparentid="col-openo-service-catalog"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/winery/servicetemplates">
-                <i class="fa fa-folder-open-o">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_model_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-		<li>
-            <a class="iframe" id="openo-nsoc-node-type" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/winery/nodetypes">
-                <i class="fa fa-folder-open-o">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_node_type" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-        <li>
-            <a class="iframe" id="openo-nsoc-vnfd" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="30.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/csarPackage.html">
+            href="/openoui/catalog/csarPackage.html">
                 <i class="fa fa-folder-open-o">
                 </i>
-                <span id="org_openo_orchestrator_nsoc_pkg" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_catalog_package" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-nsoc-template" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="40.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/template.html">
-                <i class="fa fa-list-alt">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_template" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-		<li>
-            <a class="iframe" id="openo-nsoc-hostimage" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="50.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/hostMirror.html">
+            <a class="iframe" id="openo-nsoc-template" hparentid="col-openo-service-catalog"
+            order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
+            href="/openoui/catalog/template.html">
                 <i class="fa fa-list-alt">
                 </i>
-                <span id="org_openo_orchestrator_nsoc_hostimage" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-        <li>
-            <a class="iframe" id="openo-nsoc-vApp" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="60.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/virtualApplication.html">
-                <i class="ict-VNF">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_lifecycle" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_catalog_service_template" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
     </ul>
 </li>
 <li>
-    <a href="javascript:;" id="col-openo-roc-manageview" hparentid="openo-roc">
+    <a href="javascript:;" id="col-openo-external-system-register" hparentid="openo-resource">
         <i class="fa fa-cube">
         </i>
-        <span id="org_openo_orchestrator_roc_managementview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_external_system_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -127,157 +87,32 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-roc-vim" parentid="openo-roc" hparentid="col-openo-roc-manageview"
+            <a class="iframe" id="openo-esr-vim" hparentid="col-openo-resource-manageview"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/rocvim/vimView.html">
+            href="/openoui/extsys/vim/vimView.html">
                 <i class="fa fa-cube">
                 </i>
-                <span id="org_openo_orchestrator_roc_vim" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_vim_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-roc-vnfm" parentid="openo-roc" hparentid="col-openo-roc-manageview"
+            <a class="iframe" id="openo-esr-vnfm" hparentid="col-openo-resource-manageview"
             order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/vnfmView.html">
+            href="/openoui/extsys/vnfm/vnfmView.html">
                 <i class="ict-VNFM">
                 </i>
-                <span id="org_openo_orchestrator_roc_vnfm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-roc-resourceview" hparentid="openo-roc">
-        <i class="fa fa-cubes">
-        </i>
-        <span id="org_openo_orchestrator_roc_resourceview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-roc-rs-view-overview" parentid="openo-roc" hparentid="col-openo-roc-resourceview"
-            order="8.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/rocrsview/resView.html">
-                <i class="fa fa-cubes">
-                </i>
-                <span id="org_openo_orchestrator_roc_overview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-setting" hparentid="openo-umc">
-        <i class="fa fa-puzzle-piece">
-        </i>
-        <span id="org_openo_orchestrator_umc_monitor_setting" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-setting" parentid="openo-umc" hparentid="col-openo-umc-setting" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcmonitor/monitorSettingList.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_monitor_para_setting" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-topo" hparentid="openo-umc">
-        <i class="fa fa-puzzle-piece">
-        </i>
-        <span id="org_openo_orchestrator_umc_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-physical-topo" parentid="openo-umc" hparentid="col-openo-umc-topo" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umctopo/physicalTopology.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_physical_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_vnfm_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-umc-service-topo" parentid="openo-umc" hparentid="col-openo-umc-topo" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umctopo/serviceTopology.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_service_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-fm" hparentid="openo-umc">
-        <i class="fa fa-comments">
-        </i>
-        <span id="org_openo_orchestrator_umc_fm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-alarm-currentAlarm" parentid="openo-umc" hparentid="col-openo-umc-fm"
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcfm/html/fm_currentAlarm_view.html">
-                <i class="fa fa-comments">
-                </i>
-                <span id="org_openo_orchestrator_umc_fm_currentAlarm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-pm" hparentid="openo-umc">
-        <i class="fa fa-coffee">
-        </i>
-        <span id="org_openo_orchestrator_umc_pm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-pm-historyQuery" parentid="openo-umc" hparentid="col-openo-umc-pm"
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcpm/html/meatask/meataskQueryView.html">
-                <i class="fa fa-coffee">
+            <a class="iframe" id="openo-esr-sdnc" hparentid="col-openo-resource-manageview"
+            order="30.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
+            href="/openoui/extsys/sdncontroller/controller.html">
+                <i class="ict-VNFM">
                 </i>
-                <span id="org_openo_orchestrator_umc_pm_performance_query" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_sdn_controller_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>