Skip to content

G
guns-vip
Commit ef43c08c by fengshuonan
Options

修改container模板

parent 89ae2a0e
Showing with 119 additions and 141 deletions
src/main/webapp/WEB-INF/common/_container.html
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
@ * plugins : 需要用到的插件，目前有["table"] @ * plugins : 需要用到的插件，目前有["table"]
@ * title : 页面的标题 @ * title : 页面的标题
@ * layoutContent : 主页面的html内容 @ * layoutContent : 主页面的html内容
@ * js : 业务所需要的js，为数组
@ * css : 业务所需要的css，为数组
@ * @ *
@ * 下面的需要从后台返回 @ * 下面的需要从后台返回
@ * @ *
...@@ -46,13 +48,22 @@ ...@@ -46,13 +48,22 @@
<!-- You can change the theme colors from here --> <!-- You can change the theme colors from here -->
<link href="${ctxPath}/assets/common/static/css/colors/blue.css" id="theme" rel="stylesheet"> <link href="${ctxPath}/assets/common/static/css/colors/blue.css" id="theme" rel="stylesheet">
<!--其他css--> <!--其他插件css-->
@if(isNotEmpty(plugins)){ @if(isNotEmpty(plugins)){
@if(array.contain(plugins,"table")){ @if(array.contain(plugins,"table")){
<link href="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet" type="text/css" /> <link href="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet" type="text/css" />
@} @}
@} @}
<!--其他业务用的css-->
@if(isNotEmpty(css)){
@for(item in css){
@if(strutil.startWith(item,"/")){
@item = item + ctxPath;
@}
<link href="${item}" rel="stylesheet" type="text/css" />
@}
@}
</head> </head>
...@@ -116,14 +127,25 @@ ...@@ -116,14 +127,25 @@
Feng.sessionTimeoutRegistry(); Feng.sessionTimeoutRegistry();
</script> </script>
<!--其他js--> <!--其他插件js-->
@if(isNotEmpty(plugins)){ @if(isNotEmpty(plugins)){
@if(array.contain(plugins,"table")){ @if(array.contain(plugins,"table")){
<script src="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table.min.js"></script> <script src="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table.min.js"></script>
<script src="${ctxPath}/assets/common/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table-object.js"></script> <script src="${ctxPath}/assets/common/plugins/bootstrap-table/bootstrap-table-object.js"></script>
@} @}
@} @}
<!--其他业务用的js-->
@if(isNotEmpty(js)){
@for(item in js){
@if(strutil.startWith(item,"/")){
@item = item + ctxPath;
@}
<script src="${item}"></script>
@}
@}
</body> </body>
......
src/main/webapp/WEB-INF/common/tags/button.tag
@/* @/*
按钮标签中各个参数的说明: 按钮标签中各个参数的说明:
btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色) btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色)
space : 按钮左侧是否有间隔(true/false) clickFun : 点击按钮所执行的方法
clickFun : 点击按钮所执行的方法 icon : 按钮上的图标的样式
icon : 按钮上的图标的样式 name : 按钮名称
name : 按钮名称
@*/ @*/
@var spaceCss = "";
@var btnType = ""; @var btnType = "";
@if(isEmpty(space) || space == "false"){
@ spaceCss = "";
@}else{
@ spaceCss = "button-margin";
@}
@if(isEmpty(btnCss)){ @if(isEmpty(btnCss)){
@ btnType = "primary"; @ btnType = "primary";
@}else{ @}else{
@ btnType = btnCss; @ btnType = btnCss;
@} @}
<button type="button" class="btn btn-${btnType} ${spaceCss}" onclick="${clickFun!}" id="${id!}"> <button type="button" class="btn btn-${btnType}" onclick="${clickFun!}" id="${id!}">
<i class="fa ${icon}"></i>&nbsp;${name} <i class="fa ${icon}"></i>&nbsp;${name}
</button> </button>
src/main/webapp/WEB-INF/system/user/user.html
@layout("/common/_container.html",{title:"用户管理",plugins:["table"]}){ @layout("/common/_container.html",{title:"用户管理",plugins:["table"],js:["/assets/modular/system/user/user.js"]}){
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="card card-outline-info"> <div class="card card-outline-info m-b-0">
<div class="card-block"> <div class="card-block p-b-0">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-body"> <div class="form-body">
<h4 class="card-title">查询条件</h4>
<hr>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="input-group"> <div class="input-group condition-button">
<span class="input-group-addon">用户名称</span> <span class="input-group-addon">用户名称</span>
<input type="text" class="form-control" id="name" placeholder="账号/姓名/手机号"> <input type="text" class="form-control" id="name" placeholder="账号/姓名/手机号">
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="input-group"> <div class="input-group condition-button">
<span class="input-group-addon">注册日期</span> <span class="input-group-addon">注册日期</span>
<input type="text" class="form-control" id="timeLimit" placeholder="注册日期"> <input type="text" class="form-control" id="timeLimit" placeholder="注册日期">
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group row"> <div class="input-group condition-button">
<div class="input-group-btn condition-button"> <div class="input-group-btn condition-button">
<button type="button" id="check-minutes" class="btn waves-effect waves-light btn-info condition-button-width">查询</button> <button type="button" id="check-minutes" class="btn btn-info waves-effect waves-light condition-button-width">查询</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions m-t-10">
<h4 class="card-title">查询结果</h4>
<hr>
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<button type="submit" class="btn btn-success">Submit</button>
<button type="button" class="btn btn-inverse">Cancel</button>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="card"> <div class="card m-b-0">
<table data-toggle="table" data-height="250" data-mobile-responsive="true" class="table-striped"> <div class="hidden-xs" id="managerTableToolbar" role="group">
<thead> @if(shiro.hasPermission("/mgr/add")){
<tr> <button type="button" class="btn btn-primary" onclick="MgrUser.openAddMgr()">
<th>Name</th> <i class="fa fa-plus"></i>&nbsp;添加
<th>Stars</th> </button>
<th>Forks</th> @}
<th>Description</th> @if(shiro.hasPermission("/mgr/edit")){
</tr> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.openChangeUser()">
</thead> <i class="fa fa-edit"></i>&nbsp;修改
<tbody> </button>
<tr id="tr-id-1" class="tr-class-1"> @}
<td id="td-id-1" class="td-class-1"> bootstrap-table </td> @if(shiro.hasPermission("/mgr/delete")){
<td>526</td> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.delMgrUser()">
<td>122</td> <i class="fa fa-remove"></i>&nbsp;删除
<td>An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features. (supports twitter bootstrap v2 and v3) </td> </button>
</tr> @}
<tr id="tr-id-2" class="tr-class-2"> @if(shiro.hasPermission("/mgr/reset")){
<td id="td-id-2" class="td-class-2"> multiple-select </td> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.resetPwd()">
<td>288</td> <i class="fa fa-refresh"></i>&nbsp;重置密码
<td>150</td> </button>
<td>A jQuery plugin to select multiple elements with checkboxes :) </td> @}
</tr> @if(shiro.hasPermission("/mgr/freeze")){
<tr id="tr-id-3" class="tr-class-3"> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.freezeAccount()">
<td id="td-id-3" class="td-class-3"> bootstrap-show-password </td> <i class="fa fa-warning"></i>&nbsp;冻结
<td>32</td> </button>
<td>11</td> @}
<td>Show/hide password plugin for twitter bootstrap. </td> @if(shiro.hasPermission("/mgr/unfreeze")){
</tr> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.unfreeze()">
<tr id="tr-id-4" class="tr-class-4"> <i class="fa fa-check-circle"></i>&nbsp;解除冻结
<td id="td-id-4" class="td-class-4"> blog </td> </button>
<td>13</td> @}
<td>4</td> @if(shiro.hasPermission("/mgr/setRole")){
<td>my blog</td> <button type="button" class="btn btn-primary m-l-5" onclick="MgrUser.roleAssign()">
</tr> <i class="fa fa-user-secret"></i>&nbsp;角色分配
<tr id="tr-id-5" class="tr-class-5"> </button>
<td id="td-id-5" class="td-class-5"> scutech-redmine @}
<td>6</td> </div>
<td>3</td> <#table id="managerTable"/>
<td>Redmine notification tools for chrome extension.</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/assets/common/plugins/bootstrap-table/bootstrap-table-object.js
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
this.paginationType = "server"; //默认分页方式是服务器分页,可选项"client" this.paginationType = "server"; //默认分页方式是服务器分页,可选项"client"
this.toolbarId = bstableId + "Toolbar"; this.toolbarId = bstableId + "Toolbar";
this.columns = columns; this.columns = columns;
this.height = 665; //默认表格高度665 this.height = $(window).height() - 320;
this.data = {}; this.data = {};
this.queryParams = {}; // 向后台传递的自定义参数 this.queryParams = {}; // 向后台传递的自定义参数
}; };
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
sortable: true, //是否启用排序 sortable: true, //是否启用排序
sortOrder: "desc", //排序方式 sortOrder: "desc", //排序方式
pageNumber: 1, //初始化加载第一页，默认第一页 pageNumber: 1, //初始化加载第一页，默认第一页
pageSize: 14, //每页的记录行数（*） pageSize: 20, //每页的记录行数（*）
pageList: [14, 50, 100], //可供选择的每页的行数（*） pageList: [20, 50, 100], //可供选择的每页的行数（*）
queryParamsType: 'limit', //默认值为 'limit' ,在默认情况下 传给服务端的参数为：offset,limit,sort queryParamsType: 'limit', //默认值为 'limit' ,在默认情况下 传给服务端的参数为：offset,limit,sort
queryParams: function (param) { queryParams: function (param) {
return $.extend(me.queryParams, param); return $.extend(me.queryParams, param);
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
sidePagination: this.paginationType, //分页方式：client客户端分页，server服务端分页（*） sidePagination: this.paginationType, //分页方式：client客户端分页，server服务端分页（*）
search: false, //是否显示表格搜索，此搜索是客户端搜索，不会进服务端 search: false, //是否显示表格搜索，此搜索是客户端搜索，不会进服务端
strictSearch: true, //设置为 true启用 全匹配搜索，否则为模糊搜索 strictSearch: true, //设置为 true启用 全匹配搜索，否则为模糊搜索
showColumns: true, //是否显示所有的列
showRefresh: true, //是否显示刷新按钮
minimumCountColumns: 2, //最少允许的列数 minimumCountColumns: 2, //最少允许的列数
clickToSelect: true, //是否启用点击选中行 clickToSelect: true, //是否启用点击选中行
searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
......
src/main/webapp/assets/common/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js deleted 100644 → 0
/**
* Bootstrap Table Chinese translation
* Author: Zhixin Wen<wenzhixin2010@gmail.com>
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['zh-CN'] = {
formatLoadingMessage: function () {
return '正在努力地加载数据中，请稍候……';
},
formatRecordsPerPage: function (pageNumber) {
return '每页显示 ' + pageNumber + ' 条记录';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录，总共 ' + totalRows + ' 条记录';
},
formatSearch: function () {
return '搜索';
},
formatNoMatches: function () {
return '没有找到匹配的记录';
},
formatPaginationSwitch: function () {
return '隐藏/显示分页';
},
formatRefresh: function () {
return '刷新';
},
formatToggle: function () {
return '切换';
},
formatColumns: function () {
return '列';
},
formatExport: function () {
return '导出数据';
},
formatClearFilters: function () {
return '清空过滤';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
})(jQuery);
src/main/webapp/assets/common/static/css/colors/blue.css
...@@ -72,16 +72,6 @@ a.link:hover, a.link:focus { ...@@ -72,16 +72,6 @@ a.link:hover, a.link:focus {
background-color: #009efb !important; background-color: #009efb !important;
} }
.pagination > .active > a,
.pagination > .active > span,
.pagination > .active > a:hover,
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
background-color: #009efb;
border-color: #009efb;
}
.right-sidebar .rpanel-title { .right-sidebar .rpanel-title {
background: #009efb; background: #009efb;
} }
......
src/main/webapp/assets/common/static/stylefeng/feng.css
.condition-button { .condition-button {
height: 38px; height: 38px;
margin-left: 10px;
} }
.condition-button-width { .condition-button-width {
width: 85px; width: 85px;
}
.pagination > .active > a,
.pagination > .active > span,
.pagination > .active > a:hover,
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
background-color: #f4f4f4;
border-color: #DDDDDD;
color: inherit;
cursor: default;
z-index: 2;
}
.pagination > li > a,
.pagination > li > span {
background-color: #FFFFFF;
border: 1px solid #DDDDDD;
color: inherit;
float: left;
line-height: 1.42857;
margin-left: -1px;
padding: 4px 10px;
position: relative;
text-decoration: none;
}
.fixed-table-pagination .btn{
border-color: #DDDDDD;
}
.dropdown-menu > li > a {
border-radius: 3px;
color: inherit;
line-height: 25px;
margin: 4px;
text-align: left;
font-weight: normal;
} }
\ No newline at end of file
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