Beetl 视图 include 支持相对路径，sysLogin、sysIndex 移到 themes 目录下

modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java

@@ -13,7 +13,7 @@ import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.WebStatFilter;
 
 /**
- * Servlet 配置
+ * Druid 配置
  * @author ThinkGem
  * @version 2017年11月30日
  */

modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java

@@ -11,7 +11,7 @@ import com.jeesite.modules.sys.entity.EmpUser;
 /**
  * 员工管理DAO接口
  * @author ThinkGem
- * @version 2015-4-24
+ * @version 2017-03-25
  */
 @MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
 public interface EmpUserDao extends CrudDao<EmpUser> {

modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties

@@ -59,8 +59,8 @@
 文档=Document
 图片=Image
 音频或视频=Audio or video
-请上传=Please upload
-开始上传=Start upload
+请上传=Please upload 
+开始上传=Start upload 
 或将照片拖到这里，最多可选\ {0}\ 张=Drag the photo here, at most \ {0} \ sheet
 或将照片拖到这里，最多可选\ {0}\ 个=Drag the photo here, at most \ {0}
 

modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex.html

@@ -13,18 +13,19 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse;
 <link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
 <link rel="stylesheet" href="${ctxStatic}/modules/sys/sysIndex.css?${_version}">
-<header class="main-header">
-	<% include('/modules/sys/sysIndex/topMenu.html'){} %>
+<header class="main-header">    
+	<% include('sysIndex/topMenu.html'){} %>
 </header>
 <aside class="main-sidebar">
-	<% include('/modules/sys/sysIndex/leftMenu.html'){} %>
+	<% include('sysIndex/leftMenu.html'){} %>
 </aside>
 <div class="content-wrapper">
 	<div id="tabpanel"></div>
 </div>
 <% } %>
-<div id="modifyPasswordTip" class="hide" data-message="${modifyPasswordTip!}"></div>
-<div id="desktopTabPage" class="hide" data-title="${text('仪表盘')}" data-url="${ctx}${@Global.getConfig('sys.index.desktopUrl', '/desktop')}"></div>
+<div class="hide" id="desktopTabPage" data-title="${text('仪表盘')}"
+	data-url="${ctx}${@Global.getConfig('sys.index.desktopUrl', '/desktop')}"></div>
+<div class="hide" id="modifyPasswordTip" data-message="${modifyPasswordTip!}"></div>
 <script src="${ctxStatic}/jquery-toastr/2.0/toastr.min.js?${_version}"></script>
 <script src="${ctxStatic}/jquery-plugins/jquery.slimscroll.js"></script>
 <script src="${ctxStatic}/modules/sys/sysIndex.js?${_version}"></script>

modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html

@@ -15,12 +15,12 @@
 			<% } %>
 			<li><a href="javascript:" id="fullScreen" title="${text('全屏')}"><i class="fa fa-arrows-alt"></i></a></li>
 			<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>
-			<% include('/modules/sys/sysIndex/topMenuLang.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuOnline.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuMsg.html'){} %>
-			<% //include('/modules/sys/sysIndex/topMenuNotify.html'){} %>
-			<% //include('/modules/sys/sysIndex/topMenuTask.html'){} %>
-			<% include('/modules/sys/sysIndex/topMenuUser.html'){} %>
+			<% include('topMenuLang.html'){} %>
+			<% include('topMenuOnline.html'){} %>
+			<% include('topMenuMsg.html'){} %>
+			<% //include('topMenuNotify.html'){} %>
+			<% //include('topMenuTask.html'){} %>
+			<% include('topMenuUser.html'){} %>
 		</ul>
 	</div>
 </nav>