Merge remote-tracking branch 'origin/master'

axboot · Nov 13, 2016 · ba96f07 · ba96f07
2 parents ad1b33d + 00fbf86
commit ba96f07
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 29 deletions.
diff --git a/ax-boot-admin/src/main/webapp/WEB-INF/tags/layout/frame.tag b/ax-boot-admin/src/main/webapp/WEB-INF/tags/layout/frame.tag
@@ -3,34 +3,40 @@
 <%@ tag import="com.chequer.axboot.core.utils.PhaseUtils" %>
 <%@ taglib prefix="ax" tagdir="/WEB-INF/tags" %>
 <%@ tag language="java" pageEncoding="UTF-8" body-content="scriptless" %>
-<%
-    String commonCodeJson = CommonCodeUtils.getAllByJson();
+<%String commonCodeJson = CommonCodeUtils.getAllByJson();
     boolean isDevelopmentMode = PhaseUtils.isDevelopmentMode();
-    request.setAttribute("isDevelopmentMode", isDevelopmentMode);
-%>
+    request.setAttribute("isDevelopmentMode", isDevelopmentMode);%>
 <!DOCTYPE html>
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1"/>
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1"/>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <title>${config.title}</title>
     <link rel="shortcut icon" href="<c:url value='/assets/favicon.ico'/>" type="image/x-icon"/>
     <link rel="icon" href="<c:url value='/assets/favicon.ico'/>" type="image/x-icon"/>
 
     <c:forEach var="css" items="${config.extendedCss}">
-        <link rel="stylesheet" type="text/css" href="<c:url value='${css}'/>"/></c:forEach>
-    <!--[if lt IE 10]><c:forEach var="css" items="${config.extendedCssforIE9}">
-    <link rel="stylesheet" type="text/css" href="<c:url value='${css}'/>"/></c:forEach>
+        <link rel="stylesheet" type="text/css" href="<c:url value='${css}'/>"/>
+    </c:forEach>
+    <!--[if lt IE 10]>
+    <c:forEach var="css" items="${config.extendedCssforIE9}">
+        <link rel="stylesheet" type="text/css" href="<c:url value='${css}'/>"/>
+    </c:forEach>
     <![endif]-->
 
     <script type="text/javascript">
         var CONTEXT_PATH = "<%=ContextUtil.getContext()%>";
-        var TOP_MENU_DATA = (function(json){return json;})(${menuJson});
-        var COMMON_CODE = (function(json){return json;})(<%=commonCodeJson%>);
-        var SCRIPT_SESSION = (function(json){return json;})(${scriptSession});
+        var TOP_MENU_DATA = (function (json) {
+            return json;
+        })(${menuJson});
+        var COMMON_CODE = (function (json) {
+            return json;
+        })(<%=commonCodeJson%>);
+        var SCRIPT_SESSION = (function (json) {
+            return json;
+        })(${scriptSession});
     </script>
 
     <script type="text/javascript" src="<c:url value='/assets/js/plugins.min.js' />"></script>
@@ -51,7 +57,10 @@
             <div class="ax-split-panel text-align-right">
 
                 <div class="ax-split-col ax-frame-user-info">
-                    <a href="/?language=en">English</a> / <a href="/?language=ko">Korean</a>
+                    <div class="ax-split-panel">
+                        <a href="/?language=en">English</a> / <a href="/?language=ko">한국어</a>
+                    </div>
+                    <div class="panel-split"></div>
                     <c:if test="${isDevelopmentMode}">
                         <!-- 개발자 툴 연결 아이콘 -->
                         <div class="ax-split-panel">
@@ -80,12 +89,12 @@
     <div class="ax-frame-header">
         <div class="ax-split-col" style="height: 100%;">
             <c:if test="${config.layout.leftSideMenu eq 'visible'}">
-            <div class="ax-split-panel cell-aside-handle" id="ax-aside-handel">
-                <i class="cqc-menu"></i>
-            </div>
+                <div class="ax-split-panel cell-aside-handle" id="ax-aside-handel">
+                    <i class="cqc-menu"></i>
+                </div>
             </c:if>
             <c:if test="${config.layout.leftSideMenu ne 'visible'}">
-            <div class="ax-split-panel">&nbsp;</div>
+                <div class="ax-split-panel">&nbsp;</div>
             </c:if>
             <div class="ax-split-panel cell-logo">
                 <a href="${pageContext.request.contextPath}/jsp/main.jsp">
@@ -123,9 +132,7 @@
 
     <div class="ax-frame-foot">
         <div class="ax-split-col" style="height: 100%;">
-            <div class="ax-split-panel text-align-left">
-                ${config.copyrights}
-            </div>
+            <div class="ax-split-panel text-align-left"> ${config.copyrights} </div>
             <div class="ax-split-panel text-align-right">
                 Last account activity <b id="account-activity-timer">00</b> ago.
             </div>

diff --git a/ax-boot-admin/src/main/webapp/assets/js/view/_samples/grid-form.js b/ax-boot-admin/src/main/webapp/assets/js/view/_samples/grid-form.js
@@ -243,15 +243,15 @@ fnObj.formView01 = axboot.viewExtend(axboot.formView, {
         this.model.setModel(data);
         this.modelFormatter.formatting(); // 입력된 값을 포메팅 된 값으로 변경
     },
-    validate: function () {
-        var rs = this.model.validate();
-        if (rs.error) {
-            alert(rs.error[0].jquery.attr("title") + '을(를) 입력해주세요.');
-            rs.error[0].jquery.focus();
-            return false;
-        }
-        return true;
-    },
+validate: function () {
+    var rs = this.model.validate();
+    if (rs.error) {
+        alert(rs.error[0].jquery.attr("title") + '을(를) 입력해주세요.');
+        rs.error[0].jquery.focus();
+        return false;
+    }
+    return true;
+},
     clear: function () {
         this.model.setModel(this.getDefaultData());
         this.target.find('[data-ax-path="key"]').removeAttr("readonly");