From 4c05b048892021c49bc40b63ef7169f2f5fb1237 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 24 May 2018 12:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/ruoyi/monitor/job/job.js   |  8 ++++----
 .../resources/static/ruoyi/monitor/job/jobLog.js     |  2 +-
 .../resources/static/ruoyi/monitor/online/online.js  |  2 +-
 .../static/ruoyi/monitor/operlog/operlog.js          |  2 +-
 .../resources/static/ruoyi/system/config/config.js   |  4 ++--
 src/main/resources/static/ruoyi/system/dept/dept.js  |  2 +-
 .../resources/static/ruoyi/system/dict/data/data.js  |  4 ++--
 .../resources/static/ruoyi/system/dict/type/type.js  |  6 +++---
 src/main/resources/static/ruoyi/system/menu/menu.js  |  4 ++--
 src/main/resources/static/ruoyi/system/post/post.js  |  4 ++--
 src/main/resources/static/ruoyi/system/role/role.js  |  4 ++--
 src/main/resources/static/ruoyi/system/user/user.js  |  6 +++---
 src/main/resources/static/ruoyi/tool/gen/gen.js      |  2 +-
 src/main/resources/templates/monitor/job/job.html    | 12 ++++++------
 src/main/resources/templates/monitor/job/jobLog.html |  6 +++---
 .../templates/monitor/logininfor/logininfor.html     |  4 ++--
 .../resources/templates/monitor/online/online.html   |  4 ++--
 .../resources/templates/monitor/operlog/operlog.html |  4 ++--
 .../resources/templates/system/config/config.html    | 12 ++++++------
 src/main/resources/templates/system/dept/dept.html   |  4 ++--
 .../resources/templates/system/dict/data/data.html   |  9 ++++-----
 .../resources/templates/system/dict/type/type.html   |  8 ++++----
 src/main/resources/templates/system/menu/menu.html   |  4 ++--
 src/main/resources/templates/system/post/post.html   |  8 ++++----
 src/main/resources/templates/system/role/role.html   |  8 ++++----
 src/main/resources/templates/system/user/user.html   |  8 ++++----
 src/main/resources/templates/tool/gen/gen.html       |  4 ++--
 27 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/src/main/resources/static/ruoyi/monitor/job/job.js b/src/main/resources/static/ruoyi/monitor/job/job.js
index 05e694eb..36a1ad65 100644
--- a/src/main/resources/static/ruoyi/monitor/job/job.js
+++ b/src/main/resources/static/ruoyi/monitor/job/job.js
@@ -50,8 +50,8 @@ $(function() {
             formatter: function(value, row, index) {
             	var actions = [];
 				actions.push(statusTools(row));
-				actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.jobId + '\')"><i class="fa fa-edit"></i></a> ');
-				actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.jobId + '\')"><i class="fa fa-remove"></i></a>');
+				actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.jobId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+				actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.jobId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
             }
         }];
@@ -61,9 +61,9 @@ $(function() {
 
 function statusTools(row) {
     if (row.status == 1) {
-        return '<a class="btn btn-primary btn-sm ' + statusFlag + '" href="#" title="启用" onclick="start(this,\'' + row.jobId + '\')"><i class="fa fa-check"></i></a> ';
+        return '<a class="btn btn-info btn-xs ' + statusFlag + '" href="#" onclick="start(this,\'' + row.jobId + '\')"><i class="fa fa-play"></i>启用</a> ';
     } else {
-    	return '<a class="btn btn-primary btn-sm ' + statusFlag + '" href="#" title="停用" onclick="stop(this,\'' + row.jobId + '\')"><i class="fa fa-minus"></i></a> ';
+    	return '<a class="btn btn-warning btn-xs ' + statusFlag + '" href="#" onclick="stop(this,\'' + row.jobId + '\')"><i class="fa fa-pause"></i>暂停</a> ';
     }
 }
 
diff --git a/src/main/resources/static/ruoyi/monitor/job/jobLog.js b/src/main/resources/static/ruoyi/monitor/job/jobLog.js
index ec53e162..914a37d2 100644
--- a/src/main/resources/static/ruoyi/monitor/job/jobLog.js
+++ b/src/main/resources/static/ruoyi/monitor/job/jobLog.js
@@ -49,7 +49,7 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-				actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.jobLogId + '\')"><i class="fa fa-remove"></i></a>');
+				actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.jobLogId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/monitor/online/online.js b/src/main/resources/static/ruoyi/monitor/online/online.js
index bb00cc46..f0b3e68c 100644
--- a/src/main/resources/static/ruoyi/monitor/online/online.js
+++ b/src/main/resources/static/ruoyi/monitor/online/online.js
@@ -52,7 +52,7 @@ $(function() {
             title: '操作',
             align: 'center',
             formatter: function(value, row, index) {
-                var msg = '<a class="btn btn-warning btn-sm ' + forceFlag + '" href="#" title="强退" onclick="forceLogout(\'' + row.sessionId + '\')"><i class="fa fa-remove"></i></a> ';
+                var msg = '<a class="btn btn-danger btn-xs ' + forceFlag + '" href="#" onclick="forceLogout(\'' + row.sessionId + '\')"><i class="fa fa-sign-out"></i>强退</a> ';
                 return msg;
             }
         }];
diff --git a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js
index b44b80d6..06e63488 100644
--- a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js
+++ b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js
@@ -49,7 +49,7 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-            	actions.push('<a class="btn btn-warning btn-sm ' + detailFlag + '" href="#" title="详细信息" onclick="detail(\'' + row.operId + '\')"><i class="fa fa-search"></i></a>');
+            	actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="#" onclick="detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>详细</a>');
             	return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/config/config.js b/src/main/resources/static/ruoyi/system/config/config.js
index 1ba1b995..ecc259bd 100644
--- a/src/main/resources/static/ruoyi/system/config/config.js
+++ b/src/main/resources/static/ruoyi/system/config/config.js
@@ -41,8 +41,8 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-				actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.configId + '\')"><i class="fa fa-edit"></i></a> ');
-				actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.configId + '\')"><i class="fa fa-remove"></i></a>');
+				actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.configId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+				actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.configId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js
index e2cbc55e..699a0c84 100644
--- a/src/main/resources/static/ruoyi/system/dept/dept.js
+++ b/src/main/resources/static/ruoyi/system/dept/dept.js
@@ -18,7 +18,7 @@ function loading() {
 			title : '状态',
 			formatter : function(item, index) {
 				if (item.status == '0') {
-					return '<span class="label label-primary">正常</span>';
+					return '<span class="label label-success">正常</span>';
 				} else if (item.status == '1') {
 					return '<span class="label label-danger">停用</span>';
 				}
diff --git a/src/main/resources/static/ruoyi/system/dict/data/data.js b/src/main/resources/static/ruoyi/system/dict/data/data.js
index 290521e6..25e6ff62 100644
--- a/src/main/resources/static/ruoyi/system/dict/data/data.js
+++ b/src/main/resources/static/ruoyi/system/dict/data/data.js
@@ -45,8 +45,8 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-            	actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑字典" mce_href="#" onclick="edit(\'' + row.dictCode + '\')"><i class="fa fa-edit"></i></a> ');
-            	actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" mce_href="#" onclick="remove(\'' + row.dictCode + '\')"><i class="fa fa-remove"></i></a>');
+            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.dictCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+            	actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.dictCode + '\')"><i class="fa fa-remove"></i>删除</a>');
             	return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/dict/type/type.js b/src/main/resources/static/ruoyi/system/dict/type/type.js
index 076f4ed8..40c678be 100644
--- a/src/main/resources/static/ruoyi/system/dict/type/type.js
+++ b/src/main/resources/static/ruoyi/system/dict/type/type.js
@@ -41,9 +41,9 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-            	actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.dictId + '\')"><i class="fa fa-edit"></i></a> ');
-            	actions.push('<a class="btn btn-info btn-sm ' + listFlag + '" href="#" title="详细" onclick="detail(\'' + row.dictId + '\')"><i class="fa fa-list-ul"></i></a> ');
-            	actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" mce_href="#" onclick="remove(\'' + row.dictId + '\')"><i class="fa fa-remove"></i></a>');
+            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.dictId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+            	actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="#" onclick="detail(\'' + row.dictId + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
+            	actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.dictId + '\')"><i class="fa fa-remove"></i>删除</a>');
             	return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/menu/menu.js b/src/main/resources/static/ruoyi/system/menu/menu.js
index 98bff73a..673adb34 100644
--- a/src/main/resources/static/ruoyi/system/menu/menu.js
+++ b/src/main/resources/static/ruoyi/system/menu/menu.js
@@ -34,10 +34,10 @@ function loading() {
 			width : '10%',
 			formatter : function(item, index) {
 				if (item.menuType == 'M') {
-					return '<span class="label label-primary">目录</span>';
+					return '<span class="label label-success">目录</span>';
 				}
 				if (item.menuType == 'C') {
-					return '<span class="label label-success">菜单</span>';
+					return '<span class="label label-primary">菜单</span>';
 				}
 				if (item.menuType == 'F') {
 					return '<span class="label label-warning">按钮</span>';
diff --git a/src/main/resources/static/ruoyi/system/post/post.js b/src/main/resources/static/ruoyi/system/post/post.js
index 970fc75b..dd5d8338 100644
--- a/src/main/resources/static/ruoyi/system/post/post.js
+++ b/src/main/resources/static/ruoyi/system/post/post.js
@@ -40,8 +40,8 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-				actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.postId + '\')"><i class="fa fa-edit"></i></a> ');
-				actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.postId + '\')"><i class="fa fa-remove"></i></a>');
+				actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.postId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+				actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.postId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/role/role.js b/src/main/resources/static/ruoyi/system/role/role.js
index dc7ecfb9..d7587812 100644
--- a/src/main/resources/static/ruoyi/system/role/role.js
+++ b/src/main/resources/static/ruoyi/system/role/role.js
@@ -41,8 +41,8 @@ $(function() {
             align: 'center',
             formatter: function(value, row, index) {
             	var actions = [];
-				actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i></a> ');
-				actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i></a>');
+				actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+				actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
             }
         }];
diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js
index 62e35aed..9c33270b 100644
--- a/src/main/resources/static/ruoyi/system/user/user.js
+++ b/src/main/resources/static/ruoyi/system/user/user.js
@@ -53,9 +53,9 @@ function queryUserList() {
             formatter: function(value, row, index) {
             	if(row.userType == "N") {
             		var actions = [];
-                	actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" onclick="edit(\'' + row.userId + '\')"><i class="fa fa-edit"></i></a> ');
-                	actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" onclick="remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i></a> ');
-                	actions.push('<a class="btn btn-success btn-sm ' + resetPwdFlag + '"  href="#" title="重置" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-key"></i></a>');
+                	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                	actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                	actions.push('<a class="btn btn-info btn-xs ' + resetPwdFlag + '" href="#" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-key"></i>重置</a>');
                 	return actions.join('');
 				} else {
 					return "";
diff --git a/src/main/resources/static/ruoyi/tool/gen/gen.js b/src/main/resources/static/ruoyi/tool/gen/gen.js
index 81e7be02..7be4bd15 100644
--- a/src/main/resources/static/ruoyi/tool/gen/gen.js
+++ b/src/main/resources/static/ruoyi/tool/gen/gen.js
@@ -24,7 +24,7 @@ $(function() {
             title: '操作',
             align: 'center',
             formatter: function(value, row, index) {
-                var msg = '<a class="btn btn-primary btn-sm" href="#" title="生成" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i></a> ';
+                var msg = '<a class="btn btn-primary btn-xs" href="#" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i>生成代码</a> ';
                 return msg;
             }
         }];
diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html
index 8b95633f..8fcbfdaa 100644
--- a/src/main/resources/templates/monitor/job/job.html
+++ b/src/main/resources/templates/monitor/job/job.html
@@ -6,14 +6,14 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
 		<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="monitor:job:add">
-                <i class="glyphicon glyphicon-plus"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="monitor:job:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="monitor:job:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="monitor:job:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
-	        <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:jobLog()'" shiro:hasPermission="monitor:job:list">
-	            <i class="glyphicon glyphicon-list"></i>
+	        <button class="btn btn-outline btn-default" onclick="javascript:jobLog()" shiro:hasPermission="monitor:job:list">
+	            <i class="fa fa-list"></i> 详细
 	        </button>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true" 
diff --git a/src/main/resources/templates/monitor/job/jobLog.html b/src/main/resources/templates/monitor/job/jobLog.html
index a9feda99..d49a7aef 100644
--- a/src/main/resources/templates/monitor/job/jobLog.html
+++ b/src/main/resources/templates/monitor/job/jobLog.html
@@ -6,9 +6,9 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
 		<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="monitor:job:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
-	        </button>
+			 <button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="monitor:job:batchRemove">
+                <i class="fa fa-trash-o"></i> 删除
+            </button>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true" 
 			   data-sort-name="create_time" data-sort-order="asc">
diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html
index a186be27..bc1ea14f 100644
--- a/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -6,8 +6,8 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
 		<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="monitor:logininfor:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="monitor:logininfor:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true" 
diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html
index aad3f028..eb875291 100644
--- a/src/main/resources/templates/monitor/online/online.html
+++ b/src/main/resources/templates/monitor/online/online.html
@@ -6,8 +6,8 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
         <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchForceLogout()'" shiro:hasPermission="monitor:online:batchForceLogout">
-                <i class="glyphicon glyphicon-trash"></i>
+            <button class="btn btn-outline btn-default" onclick="javascript:batchForceLogout()" shiro:hasPermission="monitor:online:batchForceLogout">
+                <i class="fa fa-trash-o"></i> 删除
             </button>
         </div>
         
diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html
index 001c16ef..c21347fc 100644
--- a/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/src/main/resources/templates/monitor/operlog/operlog.html
@@ -6,8 +6,8 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
        <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="monitor:operlog:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="monitor:operlog:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
         
diff --git a/src/main/resources/templates/system/config/config.html b/src/main/resources/templates/system/config/config.html
index 769a03cc..44bb4f2b 100644
--- a/src/main/resources/templates/system/config/config.html
+++ b/src/main/resources/templates/system/config/config.html
@@ -5,12 +5,12 @@
 <body class="gray-bg">
     <div class="wrapper wrapper-content">
         <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-        <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:config:add">
-            <i class="glyphicon glyphicon-plus"></i>
-        </button>
-        <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:config:batchRemove">
-            <i class="glyphicon glyphicon-trash"></i>
-        </button>
+	        <button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:config:add">
+	            <i class="fa fa-plus"></i> 新增
+	        </button>
+	        <button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:config:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
+	        </button>
         </div>
         <table class="bootstrap-table" data-mobile-responsive="true">
         </table>
diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html
index ddddef35..d32b7b82 100644
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -2,12 +2,12 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<body>
+<body class="gray-bg">
 	<div class="wrapper wrapper-content">
 	    <div class="btn-group hidden-xs" id="tableToolbar" role="group">
 	    	<div class="form-group">
 	            <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(100)" shiro:hasPermission="system:dept:add">
-                    <i class="fa fa-plus"></i> 新增部门
+                    <i class="fa fa-plus"></i> 新增
                 </button>
 			</div>
         </div>
diff --git a/src/main/resources/templates/system/dict/data/data.html b/src/main/resources/templates/system/dict/data/data.html
index 50e25a1c..f1331c49 100644
--- a/src/main/resources/templates/system/dict/data/data.html
+++ b/src/main/resources/templates/system/dict/data/data.html
@@ -5,14 +5,13 @@
 <head th:include="include :: header"></head>
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
-	
 	   <input name="dictType" id="dictType" type="hidden"  th:value="${dict.dictType}" />
        <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:dict:add">
-                <i class="glyphicon glyphicon-plus"></i>
+            <button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:dict:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:dict:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:dict:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
         
diff --git a/src/main/resources/templates/system/dict/type/type.html b/src/main/resources/templates/system/dict/type/type.html
index a41d8814..74955a9f 100644
--- a/src/main/resources/templates/system/dict/type/type.html
+++ b/src/main/resources/templates/system/dict/type/type.html
@@ -6,11 +6,11 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
        <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:dict:add">
-                <i class="glyphicon glyphicon-plus"></i>
+            <button class="btn btn-outline btn-default" nclick="javascript:add()" shiro:hasPermission="system:dict:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:dict:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:dict:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
         
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index 0b5e1d17..2b3d0b9a 100644
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -2,12 +2,12 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<body>
+<body class="gray-bg">
 	<div class="wrapper wrapper-content">
 	    <div class="btn-group hidden-xs" id="tableToolbar" role="group">
 	    	<div class="form-group">
 	            <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(0)" shiro:hasPermission="system:menu:add">
-                    <i class="fa fa-plus"></i> 新增菜单
+                    <i class="fa fa-plus"></i> 新增
                 </button>
 			</div>
         </div>
diff --git a/src/main/resources/templates/system/post/post.html b/src/main/resources/templates/system/post/post.html
index fd1a585f..b1668814 100644
--- a/src/main/resources/templates/system/post/post.html
+++ b/src/main/resources/templates/system/post/post.html
@@ -6,11 +6,11 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
 		<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:post:add">
-                <i class="glyphicon glyphicon-plus"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:post:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:post:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:post:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true" 
diff --git a/src/main/resources/templates/system/role/role.html b/src/main/resources/templates/system/role/role.html
index 2ece59df..98692bb3 100644
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -6,11 +6,11 @@
 <body class="gray-bg">
 	<div class="wrapper wrapper-content">
 		<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:role:add">
-                <i class="glyphicon glyphicon-plus"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:role:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-			<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:role:batchRemove">
-	            <i class="glyphicon glyphicon-trash"></i>
+			<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:role:batchRemove">
+	            <i class="fa fa-trash-o"></i> 删除
 	        </button>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true"
diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html
index 4bf9dbbb..dc8e5126 100644
--- a/src/main/resources/templates/system/user/user.html
+++ b/src/main/resources/templates/system/user/user.html
@@ -30,11 +30,11 @@
 	
 	<div class="wrapper wrapper-content ui-layout-center">
         <div class="btn-group hidden-xs" id="tableToolbar" role="group">
-        	<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add()'" shiro:hasPermission="system:user:add">
-                <i class="glyphicon glyphicon-plus"></i>
+        	<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:user:add">
+                <i class="fa fa-plus"></i> 新增
             </button>
-            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchRemove()'" shiro:hasPermission="system:user:batchRemove">
-                <i class="glyphicon glyphicon-trash"></i>
+            <button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:user:batchRemove">
+                <i class="fa fa-trash-o"></i> 删除
             </button>
         </div>
         <input type="hidden" id="deptId">
diff --git a/src/main/resources/templates/tool/gen/gen.html b/src/main/resources/templates/tool/gen/gen.html
index bf3bd39c..aaef96f0 100644
--- a/src/main/resources/templates/tool/gen/gen.html
+++ b/src/main/resources/templates/tool/gen/gen.html
@@ -5,8 +5,8 @@
 <head th:include="include :: header"></head>
 <body class="gray-bg">
 	<div class="btn-group hidden-xs" id="tableToolbar" role="group">
-		<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:batchGenCode()'" shiro:hasPermission="tool:gen:code">
-	        <i class="glyphicon glyphicon-download-alt"></i>
+		<button class="btn btn-outline btn-default" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
+	        <i class="fa fa-download"></i> 批量生成
 	    </button>
     </div>
 	<div class="wrapper wrapper-content">