diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index 17445b3b..de23035f 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -16,21 +16,23 @@ "> -"> "> "> "> "> + + "> "> "> +"> "> "> "> -"> + "> diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index a8930051..c6935025 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -487,8 +487,9 @@ $("#fastTerm--top").onEnterPress(fnGlobalFastSearch); function fnGlobalFastSearch(){ var integrationSearchMenuNum = "17"; - - closeTab(integrationSearchMenuNum); + + var url = $("#menus").find("li[data-key='"+integrationSearchMenuNum+"'] a").attr("onclick").split("'")[1]; + mainTabs.close(url); var itegrationSearchMenu = $("#menus").find("li[data-key='"+integrationSearchMenuNum+"'] a")[0]; @@ -496,9 +497,9 @@ function fnGlobalFastSearch(){ var fastTerm = $("#fastTerm--top").val(); var fastBy = $("#fastBy--top").val(); - openMenu(itegrationSearchMenu, "?fastBy="+fastBy+"&fastTerm="+fastTerm); + openMenu(url+"?fastBy="+fastBy+"&fastTerm="+fastTerm); } else { - openMenu(itegrationSearchMenu); + openMenu(url); } } diff --git a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp index 4ef97411..293fa428 100644 --- a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp @@ -29,10 +29,12 @@ function fnHome(){ } let userMenus = ${userMenus}; - +let menuSupport = new MenuSupport("#layout-menu"); function setUserMenus(menus) { - let menuSupport = new FimsMenuSupport("#layout-menu").setMenuInfo(menus).setActive(wctx.current()); + menuSupport.setMenuInfo(menus).setActive(wctx.current()); let currentMenu = menuSupport.getMenu(wctx.current()); + if (currentMenu) + setPageTitle(currentMenu.name); } setUserMenus(userMenus); diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index bea33e07..3dbfecd9 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -4,32 +4,37 @@