Skip to content

F
fgqyxxlr
Commit 4c05b048 by RuoYi
Options

按钮样式调整

parent 2cf599b4
Showing with 72 additions and 73 deletions
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> ';
}
}
......
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('');
}
}];
......
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;
}
}];
......
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('');
}
}];
......
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('');
}
}];
......
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>';
}
......
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('');
}
}];
......
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('');
}
}];
......
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>';
......
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('');
}
}];
......
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('');
}
}];
......
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 "";
......
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;
}
}];
......
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"
......
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">
......
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"
......
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>
......
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>
......
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>
......
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>
......
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>
......
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>
......
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>
......
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"
......
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"
......
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">
......
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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment