From 6e00b645b3b7172ca4441b79e2a0a5d3f21be184 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Tue, 6 Feb 2018 10:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/left_menu.jsp | 18 +++++++++---------
 src/main/webapp/WEB-INF/views/home.jsp        |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp
index 516f97071..071075475 100644
--- a/src/main/webapp/WEB-INF/include/left_menu.jsp
+++ b/src/main/webapp/WEB-INF/include/left_menu.jsp
@@ -14,17 +14,17 @@
      					
 	     				<li class="nav-item <c:if test="${secondStatus.index==0 }"> active open</c:if>">
 		     				
-		     				<a class="nav-link nav-toggle"
-		     					
+		     				<a class="nav-link nav-toggle"		     					
 		     					<c:if test="${secondMenu.href != null && secondMenu.href != ''}" var="secondHref">
 		     						 href="${ctx}/${secondMenu.href }" target="mainFrame" >
 		     					</c:if>
 		     					<c:if test="${!secondHref }">
 		     						 href="javascript:;" class="nav-link nav-toggle"> 
-		     					</c:if>
+		     					</c:if> 
 		     					
 								<i class="${secondMenu.icon }"></i> 
-								<span class="title"> ${secondMenu.name } <%-- <spring:message code="${secondMenu.code}"></spring:message> --%></span>
+								<span class="title"> 
+								<%-- ${secondMenu.name } --%> <spring:message code="${secondMenu.code}"></spring:message></span>
 								<c:if test="${not empty secondMenu.children }" var="secondClid">
 									<span class="arrow open"></span>
 								</c:if>
@@ -39,16 +39,16 @@
 										
 										<li class="nav-item <c:if test="${not empty thirdMenu.children && thirdStatus.index==0}">active open</c:if>">
 							
-						     				<a class="nav-link nav-toggle"
-		     					
+						     				<a class="nav-link nav-toggle"		     					
 						     					<c:if test="${thirdMenu.href != null && thirdMenu.href != ''}" var="thirdHref">
 						     						 href="${ctx}/${thirdMenu.href }" target="mainFrame" >
 						     					</c:if>
 						     					<c:if test="${!thirdHref }">
 						     						 href="javascript:;" class="nav-link nav-toggle"> 
-						     					</c:if>
+						     					</c:if> 
 		     					
-												<span class="title">${thirdMenu.name } <%-- <spring:message code="${thirdMenu.code}"></spring:message> --%></span> 
+												<span class="title">
+												<%-- ${thirdMenu.name } --%><spring:message code="${thirdMenu.code}"></spring:message></span> 
 												<c:if test="${not empty thirdMenu.children }" var="thiredClid">
 													<span class="arrow open"></span>
 												</c:if>
@@ -59,7 +59,7 @@
 													<c:forEach  items="${thirdMenu.children}" var="fourthMenu">
 														<li class="nav-item">
 															<a href="${ctx}/${fourthMenu.href }" target="mainFrame" class="nav-link ">
-																${fourthMenu.name } <%-- <spring:message code="${fourthMenu.code}"></spring:message> --%>
+																<%-- ${fourthMenu.name } --%> <spring:message code="${fourthMenu.code}"></spring:message> 
 																<!-- <span class="badge badge-danger">1</span> -->
 															</a>
 														</li>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 78f5102c9..b549bef96 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -47,7 +47,7 @@
 					  				<c:when test="${not empty menu.children and menu.children[0].isTop eq 1 }">
 					  				
 					  					<a href="javascript:;" id="${menu.id}" data-hover="megamenu-dropdown" data-close-others="true">
-							  				${menu.name }<%-- <spring:message code="${menu.code}"></spring:message> --%>
+							  				<%-- ${menu.name } --%><spring:message code="${menu.code}"></spring:message>
 							  				<i class="fa fa-angle-down"></i>
 						  				</a>
 						  				
@@ -59,7 +59,8 @@
 				          							</c:if>
 				          							<li>
 				          								<a href="javascript:;" id="${secondMenu.id}">
-				          									<i class="fa ${secondMenu.icon }"></i>&nbsp;${secondMenu.name }<%-- <spring:message code="${secondMenu.code}"></spring:message> --%>
+				          									<i class="fa ${secondMenu.icon }"></i>&nbsp;
+				          									<%-- ${secondMenu.name } --%><spring:message code="${secondMenu.code}"></spring:message>
 				          								</a>
 				          							</li> 
 				          							
@@ -72,7 +73,7 @@
 					  				
 					  				<c:otherwise>
 					  					<a href="javascript:;" id="${menu.id}">
-							  				${menu.name }<%-- <spring:message code="${menu.code}"></spring:message> --%>
+							  				<%-- ${menu.name } --%><spring:message code="${menu.code}"></spring:message>
 						  				</a>
 					  				</c:otherwise>
 					  			</c:choose>