aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author“shentao” <shentao@chinamobile.com>2016-10-12 17:29:17 +0800
committer“shentao” <shentao@chinamobile.com>2016-10-12 17:29:17 +0800
commite02b6549e9154cb2d7b7a8619c07b9206fa7f135 (patch)
treef7e067eb2335dab170261e781f38c639dace0906
parent7855b5fc8991d51d7a5f3ca6511c15b731702f11 (diff)
GSO-16
Change-Id: I69157e173581c66b7f467c998a5c559afca44eba Signed-off-by: “shentao” <shentao@chinamobile.com>
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/default.html3
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-menu-i18n-en-US.properties17
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/js/core/openoFrameWork.js146
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html37
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html98
5 files changed, 63 insertions, 238 deletions
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 ac598c58..4e72f1a8 100644
--- a/openo-portal/portal-common/src/main/webapp/common/default.html
+++ b/openo-portal/portal-common/src/main/webapp/common/default.html
@@ -74,7 +74,7 @@
</a>
<div class="hor-menu hidden-sm hidden-xs">
<ul class="nav navbar-nav hormenu" id="main_hormenu" menuSrc="main_blank.html"></ul>
- <ul class="nav navbar-nav hormenu" id="f_hormenu" menuSrc="main_Fmegabar.html"></ul>
+ <ul class="nav navbar-nav hormenu" id="f_hormenu" menuSrc="main_blank.html"></ul>
</div>
<ul class="nav navbar-nav pull-right">
<div class="zte-theme-panel">
@@ -231,7 +231,6 @@
<script>
var panel = $('.zte-theme-panel');
loadi18n_WebFramework('web-framework-i18n', 'i18n/', 'openo_frame_page_i18n');
- iniHorMenu();
iniFMenu();
</script>
<script>
diff --git a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-menu-i18n-en-US.properties b/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-menu-i18n-en-US.properties
index 7e4dd453..cf52a48d 100644
--- a/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-menu-i18n-en-US.properties
+++ b/openo-portal/portal-common/src/main/webapp/common/i18n/web-framework-menu-i18n-en-US.properties
@@ -14,10 +14,7 @@
# limitations under the License.
#
openo_menu_service=Service
-openo_menu_resource=Resource
-openo_menu_monitor=Monitor
-openo_menu_service_list=Service List
-openo_menu_service_list_overview=Overview
+openo_menu_service_service_management=Service Management
openo_menu_orchestrator=Orchestrator
openo_menu_orchestrator_model_design=Model Design
openo_menu_orchestrator_node_type=Node Type
@@ -25,13 +22,11 @@ openo_menu_orchestrator_package=Package
openo_menu_orchestrator_service_template=Service Template
openo_menu_orchestrator_host_image=Host Image
openo_menu_orchestrator_lifecycle=Lifecycle
-openo_menu_manage_view=Manage View
-openo_menu_manage_view_vim_manage=VIM Manage
-openo_menu_manage_view_vnfm=VNFM
-openo_menu_resource_view=Resource View
-openo_menu_resource_view_overview=Overview
-openo_menu_setting=Setting
-openo_menu_setting_monitor_para_setting=Monitor Para Setting
+openo_menu_resource_mgr=Resource Mgr
+openo_menu_resource_mgr_sdno=Resource Mgr sdno
+openo_menu_resource_mgr_nfvo=Resource Mgr Nfvo
+openo_menu_user=User
+openo_menu_user_user_management=User Management
openo_menu_topology=Topology
openo_menu_topology_physical_topology=Physical Topology
openo_menu_topology_service_topology=Service Topology
diff --git a/openo-portal/portal-common/src/main/webapp/common/js/core/openoFrameWork.js b/openo-portal/portal-common/src/main/webapp/common/js/core/openoFrameWork.js
index 6792084c..beebcb87 100644
--- a/openo-portal/portal-common/src/main/webapp/common/js/core/openoFrameWork.js
+++ b/openo-portal/portal-common/src/main/webapp/common/js/core/openoFrameWork.js
@@ -3280,140 +3280,24 @@ var setLayoutValueByCookie = function () {
// } else {
// $('.nav-pos-direction', panel).attr("disabled", true);
// }
-}
-function getHorMenu(url){
- setLayoutValueByCookie();
- if (url.length<2){
- return;
- }
- url=openoFrameWork.handlBaseURL(url);
- openoFrameWork.startPageLoading();//菜单加载中请稍候....
- var pagehorbar=$('#main_hormenu')
- pagehorbar.empty();
- $.ajax({
- type: "GET",
- async : false,
- cache: false,
- url: url,
- dataType: "html",
- success: function (res) {
- //去除script标签以后添加到主框架以防止append方法因为加载script标签失败导致后面的代码无法运行
- //res = stripHtmlScripts(res);
- var resScriptsSriped = stripHtmlScripts(res);
- $('#main_hormenu').append(resScriptsSriped);
- runHtmlScripts(res);
- // 增加mysql判断,如果数据库为mysql,去掉基础数据备份功能菜单项
- var dbType = openoFrameWork_conf.dbType;
- if (dbType == "mysql") {
- var item=$(".hor-menu a[id='uep-ict-backup-baseDataBack']");
- item.parent().remove();
- }
- horMenuAuthentication('main_hormenu');
- openoFrameWork.stopPageLoading();
- if($('.nav-pos-direction', panel).val() === "horizontal"){
- setTimeout(function () {
- //goToHomePage();//注意这里由于水平和左边栏菜单都在一个页面中出现,所以这里只调用一次
- }, 150);
- }
- },
- error: function (xhr, ajaxOptions, thrownError) {
- //$('#main_hormenu').append('<h4 class="nav-load-error">'+$.i18n.prop('com_zte_ums_ict_framework_ui_loadmenuerror')+'</h4>');//加载系统菜单失败!
- var pcontent = $("[class='page-content']");
- //pcontent.css("marginLeft",225);
- $('.nav-pos-direction', panel).attr("disabled", true);
- }
- });
};
-//加载横菜单的子菜单,加到左边的siderbar里面
-function getMegaFMenu( url ){
- if (url.length<2){
- return;
- }
- url=openoFrameWork.handlBaseURL(url);
- openoFrameWork.startPageLoading();//菜单加载中请稍候....
- var siderDiv =$( '#' + megaSiderDivId );
- siderDiv.empty();
- siderDiv.append("<li class='sidebar-toggler-wrapper'><div class='sidebar-toggler hidden-xs hidden-sm'></div></li>");
- $.ajax({
- type: "GET",
- async : false,
- cache: false,
- url: url,
- dataType: "html",
- success: function (res) {
- //去除script标签以后添加到主框架以防止append方法因为加载script标签失败导致后面的代码无法运行
- var resScriptsSriped = stripHtmlScripts(res);
- siderDiv.append(resScriptsSriped);
- runHtmlScripts(res);
- FMenuAuthentication( megaDivId ,megaSiderDivId );
- rebuildHorMenu();
- ajustFMenu( megaDivId ,megaSiderDivId );
- openoFrameWork.stopPageLoading();
- },
- error: function (xhr, ajaxOptions, thrownError) {
- //siderDiv.append('<h4 class="nav-load-error">'+$.i18n.prop('com_zte_ums_ict_framework_ui_loadmenuerror')+'</h4>');//加载系统菜单失败!
- //var pcontent = $("[class='page-content']");
- //pcontent.css("marginLeft",225);
- }
- });
-}
-function iniHorMenu(){
- var hormenu=$('#main_hormenu');
- if(!hormenu) return;
- var url=hormenu.attr("menuSrc");
- if(url&&url.length>0){
- getHorMenu(url);
- }
- //
- var megaFMenu = $('#'+megaSiderDivId);
- if(!megaFMenu) return;
- var url = megaFMenu.attr("menuSrc");
- if(url&&url.length>0){
- getMegaFMenu(url);
- }
-};
-function iniFMenu(){
- var fhormenu=$('#f_hormenu');
- var fsidemenu=$('#page-f-sidebar-menu');
- if(!fhormenu || !fsidemenu) return;
- var urlmega=fhormenu.attr("menuSrc");
- var urlsider=fsidemenu.attr("menuSrc");
- if(urlmega&&urlmega.length>0 && urlsider && urlsider.length > 0){
- getFMenu(urlmega , urlsider);
- }
+
+function iniFMenu() {
+ var fsidemenu = $('#page-f-sidebar-menu');
+ if (!fsidemenu) {
+ return;
+ }
+ var urlsider = fsidemenu.attr("menuSrc");
+ if (urlsider && urlsider.length > 0) {
+ getFMenu(urlsider);
+ }
};
-function getFMenu( urlMega , urlSider ){
- if (urlMega.length<2 || urlSider.length<2){
- return;
- }
- urlMega=openoFrameWork.handlBaseURL(urlMega);
- urlSider=openoFrameWork.handlBaseURL(urlSider);
- openoFrameWork.startPageLoading();//菜单加载中请稍候....
- var fhorbar=$('#f_hormenu');
- fhorbar.empty();
- var fSideBar= $("#page-f-sidebar-menu");
- fSideBar.empty();
- $.ajax({
- type: "GET",
- async : false,
- cache: false,
- url: urlMega,
- dataType: "html",
- success: function (res) {
- var resScriptsSriped = stripHtmlScripts(res);
- $('#f_hormenu').append(resScriptsSriped);
- horMenuAuthentication('f_hormenu');
- runHtmlScripts(res);
- dealMysqlBackupMenu();
- openoFrameWork.stopPageLoading();
- },
- error: function (xhr, ajaxOptions, thrownError) {
- $('#f_hormenu').append('<h4 class="nav-load-error">'+$.i18n.prop('com_zte_ums_ict_framework_ui_loadmenuerror')+'</h4>');//加载系统菜单失败!
- var pcontent = $("[class='page-content']");
- $('.nav-pos-direction', panel).attr("disabled", true);
- }
- });
+
+function getFMenu(urlSider) {
+ urlSider = openoFrameWork.handlBaseURL(urlSider);
+ openoFrameWork.startPageLoading();
+
var fpagesidebar=$('#' + fMenuSiderDivId);
fpagesidebar.empty();
fpagesidebar.append("<li class='sidebar-toggler-wrapper'><div class='sidebar-toggler hidden-xs hidden-sm'></div></li>");
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
deleted file mode 100644
index 0f200d6f..00000000
--- a/openo-portal/portal-common/src/main/webapp/common/main_Fmegabar.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2016, CMCC Technologies Co., Ltd.
-
- 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.
--->
-<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="" operation="" iframeautoscroll="auto" defaultdisplay="">
- <span id="openo_menu_service" name_i18n="openo_frame_top_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </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="" operation="" iframeautoscroll="auto" defaultdisplay="">
- <span id="openo_menu_resource" name_i18n="openo_frame_top_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </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="" operation="" iframeautoscroll="auto" defaultdisplay="">
- <span id="openo_menu_monitor" name_i18n="openo_frame_top_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </a>
-</li>
-<script>loadi18n_WebFramework('web-framework-menu-i18n', 'i18n/', 'openo_frame_top_menu_i18n');</script>
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 ffd522bc..fb11b1a3 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
@@ -17,15 +17,53 @@
<li>
<a href="javascript:;" id="col-openo-umc-monitor-service" hparentid="openo-nsoc">
<i class="fa fa-comments"></i>
- <span id="openo_menu_service_list" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
+ <span id="openo_menu_service" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
<span class="selected"></span>
<span class="arrow"></span>
</a>
<ul class="sub-menu">
<li>
- <a href="todo.html" class="iframe" id="openo-umc-monitor-service-overview" parentid="openo-nsoc" hparentid="col-openo-umc-monitor-service" order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
+ <a href="../lifecyclemgr/gsolcmmain.html" class="iframe" id="openo-umc-monitor-service-overview" parentid="openo-nsoc" hparentid="col-openo-umc-monitor-service" order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
<i class="fa fa-comments"></i>
- <span id="openo_menu_service_list_overview" name_i18n="openo_frame_left_menu_i18n"></span>
+ <span id="openo_menu_service_service_management" name_i18n="openo_frame_left_menu_i18n"></span>
+ </a>
+ </li>
+ </ul>
+</li>
+<li>
+ <a href="javascript:;" id="col-openo-roc-manageview" hparentid="openo-roc">
+ <i class="fa fa-cube"></i>
+ <span id="openo_menu_resource_mgr" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
+ <span class="selected"></span>
+ <span class="arrow"></span>
+ </a>
+ <ul class="sub-menu">
+ <li>
+ <a href="../resmgr-sdn/resource.html" class="iframe" id="openo-roc-vim" parentid="openo-roc" hparentid="col-openo-roc-manageview" order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
+ <i class="fa fa-cube"></i>
+ <span id="openo_menu_resource_mgr_sdno" name_i18n="openo_frame_left_menu_i18n"></span>
+ </a>
+ </li>
+ <li>
+ <a href="../resmgr-nfv/resource.html" class="iframe" id="openo-roc-vnfm" parentid="openo-roc" hparentid="col-openo-roc-manageview" order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
+ <i class="ict-VNFM"></i>
+ <span id="openo_menu_resource_mgr_nfvo" name_i18n="openo_frame_left_menu_i18n"></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="openo_menu_user" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
+ <span class="selected"></span>
+ <span class="arrow"></span>
+ </a>
+ <ul class="sub-menu">
+ <li>
+ <a href="../user/user.html" 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">
+ <i class="fa fa-puzzle-piece"></i>
+ <span id="openo_menu_user_user_management" name_i18n="openo_frame_left_menu_i18n"></span>
</a>
</li>
</ul>
@@ -77,60 +115,6 @@
</ul>
</li>
<li>
- <a href="javascript:;" id="col-openo-roc-manageview" hparentid="openo-roc">
- <i class="fa fa-cube"></i>
- <span id="openo_menu_manage_view" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </a>
- <ul class="sub-menu">
- <li>
- <a href="/iui/rocvim/vimView.html" class="iframe" id="openo-roc-vim" parentid="openo-roc" hparentid="col-openo-roc-manageview" order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
- <i class="fa fa-cube"></i>
- <span id="openo_menu_manage_view_vim_manage" name_i18n="openo_frame_left_menu_i18n"></span>
- </a>
- </li>
- <li>
- <a href="/iui/nsoc/vnfmView.html" class="iframe" id="openo-roc-vnfm" parentid="openo-roc" hparentid="col-openo-roc-manageview" order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto">
- <i class="ict-VNFM"></i>
- <span id="openo_menu_manage_view_vnfm" name_i18n="openo_frame_left_menu_i18n"></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="openo_menu_resource_view" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </a>
- <ul class="sub-menu">
- <li>
- <a href="/iui/rocrsview/resView.html" 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">
- <i class="fa fa-cubes"></i>
- <span id="openo_menu_resource_view_overview" name_i18n="openo_frame_left_menu_i18n"></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="openo_menu_setting" name_i18n="openo_frame_left_menu_i18n" class="title"></span>
- <span class="selected"></span>
- <span class="arrow"></span>
- </a>
- <ul class="sub-menu">
- <li>
- <a href="/iui/umcmonitor/monitorSettingList.html" 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">
- <i class="fa fa-puzzle-piece"></i>
- <span id="openo_menu_setting_monitor_para_setting" name_i18n="openo_frame_left_menu_i18n"></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="openo_menu_topology" name_i18n="openo_frame_left_menu_i18n" class="title"></span>