github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.oschina.net/smallc/SpringBlade

Browse Source
This commit is contained in:
zhuangqian 2016-12-01 09:02:45 +08:00
commit 5ba5f09f77
8 changed files with 258 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/smallchill/core/beetl/tag/SideBarTag.java
View File

@ -95,7 +95,7 @@ public class SideBarTag extends Tag {
String addtabs = Func.isEmpty(side.get("URL")) ? "" : "data-addtabs=\"" + side.get("CODE") + "\""; String addtabs = Func.isEmpty(side.get("URL")) ? "" : "data-addtabs=\"" + side.get("CODE") + "\"";
firstMenu += "<li >"; firstMenu += "<li >";
firstMenu += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + side.get("NAME") + "\" data-icon=\"fa " + side.get("ICON") + "\" class=\"" + getDropDownClass(Func.toStr(side.get("CODE")),"dropdown-toggle") + " tmsp-pointer\">"; firstMenu += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + side.get("NAME") + "\" data-icon=\"fa " + side.get("ICON") + "\" class=\"" + getDropDownClass(Func.toStr(side.get("CODE")),"dropdown-toggle") + " blade-pointer\">";
firstMenu += " <i class=\"menu-icon fa " + side.get("ICON") + "\"></i>"; firstMenu += " <i class=\"menu-icon fa " + side.get("ICON") + "\"></i>";
firstMenu += " <span class=\"menu-text\">" + side.get("NAME") + "</span>"; firstMenu += " <span class=\"menu-text\">" + side.get("NAME") + "</span>";
firstMenu += " <b class=\"arrow " + getDropDownClass(Func.toStr(side.get("CODE")),"fa fa-angle-down") + "\"></b>"; firstMenu += " <b class=\"arrow " + getDropDownClass(Func.toStr(side.get("CODE")),"fa fa-angle-down") + "\"></b>";
@ -169,7 +169,7 @@ public class SideBarTag extends Tag {
String addtabs = Func.isEmpty(_url) ? "" : "data-addtabs=\"" + _code + "\""; String addtabs = Func.isEmpty(_url) ? "" : "data-addtabs=\"" + _code + "\"";
Str += "<li>"; Str += "<li>";
Str += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + _name + "\" data-icon=\"fa " + _icon + "\" class=\"" + getDropDownClass(_code, "dropdown-toggle") + " tmsp-pointer\">"; Str += " <a data-url=\"" + href + "\" " + addtabs + " data-title=\"" + _name + "\" data-icon=\"fa " + _icon + "\" class=\"" + getDropDownClass(_code, "dropdown-toggle") + " blade-pointer\">";
Str += " <i class=\"menu-icon fa " + _icon + "\"></i>"; Str += " <i class=\"menu-icon fa " + _icon + "\"></i>";
Str += _name; Str += _name;
Str += " <b class=\"arrow " + getDropDownClass(_code,"fa fa-angle-down") + "\"></b>"; Str += " <b class=\"arrow " + getDropDownClass(_code,"fa fa-angle-down") + "\"></b>";

17
src/main/webapp/WEB-INF/view/common/_container.html
View File

@ -1,11 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html > <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title!'curd'}</title> <title>${title!'blade'}</title>
<link rel="shortcut icon" href="${ctxPath}/static/style/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="${ctxPath}/static/style/images/favicon.ico" type="image/x-icon" />
<meta name="renderer" content="webkit" /><!-- 360浏览器默认选择webkit内核 --> <!-- 360浏览器默认选择webkit内核 -->
<meta name="description" content="Common form elements and layouts" /> <meta name="renderer" content="webkit" />
<meta name="description" content="blade framework" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
<!-- bootstrap & fontawesome --> <!-- bootstrap & fontawesome -->
<link rel="stylesheet" href="${ctxPath}/static/assets/css/bootstrap.css" /> <link rel="stylesheet" href="${ctxPath}/static/assets/css/bootstrap.css" />
@ -28,19 +29,17 @@
</head> </head>
<body class="no-skin"> <body class="no-skin">
<div class="main-container" id="main-container"> <div class="main-container" id="main-container">
<!-- /section:basics/sidebar -->
<div class="main-content"> <div class="main-content">
<div class="main-content-inner"> <div class="main-content-inner">
<!-- /section:basics/content.breadcrumbs -->
<div class="page-content"> <div class="page-content">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
${layoutContent} ${layoutContent}
</div> </div>
</div> </div>
</div><!-- /.page-content --> </div>
</div> </div>
</div><!-- /.main-content --> </div>
</div><!-- /.main-container --> </div>
</body> </body>
</html> </html>

11
src/main/webapp/WEB-INF/view/common/_curd/_add.html
View File

@ -1,21 +1,20 @@
<div class="space-4"></div> <div class="space-4"></div>
<!-- #section:elements.form --> @ for(x in col) {
@for(x in col){ @ if(!isEmpty(x.title)) {
@ if(!isEmpty(x.title)){
<div class="page-header-form"> <div class="page-header-form">
<h2> <h2>
${x.title!} ${x.title!}
@if(!isEmpty(x.small)){ @ if(!isEmpty(x.small)) {
<small> <small>
<i class="ace-icon fa fa-angle-double-right"> <i class="ace-icon fa fa-angle-double-right">
${x.small!} ${x.small!}
</i> </i>
</small> </small>
@} @ }
</h2> </h2>
</div> </div>
@ }else{ @ } else {
@ var display = (func.like(x.type,"hidden")) ? "none" : "block"; @ var display = (func.like(x.type,"hidden")) ? "none" : "block";
@ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name); @ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name);
@ if(x.newline!false){ @ if(x.newline!false){

18
src/main/webapp/WEB-INF/view/common/_curd/_edit.html
View File

@ -1,24 +1,22 @@
<div class="space-4"></div> <div class="space-4"></div>
<!-- 判断表单是否发生过更改的token --> <!-- 判断表单是否发生过更改的token -->
<input type="hidden" id="form_token" value="0"/> <input type="hidden" id="form_token" value="0"/>
<!-- 乐观锁控制 --> <!-- 乐观锁控制 -->
<input type="hidden" id="_version" name="VERSION" value="0"> <input type="hidden" id="_version" name="VERSION" value="0">
@if(isEmpty(keys)){ @ if(isEmpty(keys)) {
<input type="hidden" id="_${key!'id'}" name="${table!}.${key!'id'}" value=""/> <input type="hidden" id="_${key!'id'}" name="${table!}.${key!'id'}" value=""/>
@} @ } else {
@else{ @for(k in keys) {
@for(k in keys){
<input type="hidden" id="${k.table!}_${k.key!'id'}" name="${k.table!}.${k.key!'id'}" value=""/> <input type="hidden" id="${k.table!}_${k.key!'id'}" name="${k.table!}.${k.key!'id'}" value=""/>
@} @}
@} @ }
@for(x in col){ @ for(x in col){
@ if(!isEmpty(x.title)){ @ if(!isEmpty(x.title)) {
<div class="page-header-form"> <div class="page-header-form">
<h2> <h2>
${x.title!} ${x.title!}
@if(!isEmpty(x.small)){ @if(!isEmpty(x.small)) {
<small> <small>
<i class="ace-icon fa fa-angle-double-right"> <i class="ace-icon fa fa-angle-double-right">
${x.small!} ${x.small!}
@ -28,7 +26,7 @@
</h2> </h2>
</div> </div>
@ }else{ @ } else {
@ var display = (func.like(x.type,"hidden")) ? "none" : "block"; @ var display = (func.like(x.type,"hidden")) ? "none" : "block";
@ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name); @ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name);
@ if(x.newline){ @ if(x.newline){

13
src/main/webapp/WEB-INF/view/common/_curd/_view.html
View File

@ -1,24 +1,23 @@
<div class="space-4"></div> <div class="space-4"></div>
<!-- #section:elements.form --> @ for(x in col) {
@for(x in col){ @ if(!isEmpty(x.title)) {
@ if(!isEmpty(x.title)){
<div class="page-header-form"> <div class="page-header-form">
<h2> <h2>
${x.title!} ${x.title!}
@if(!isEmpty(x.small)){ @ if(!isEmpty(x.small)) {
<small> <small>
<i class="ace-icon fa fa-angle-double-right"> <i class="ace-icon fa fa-angle-double-right">
${x.small!} ${x.small!}
</i> </i>
</small> </small>
@} @ }
</h2> </h2>
</div> </div>
@ }else{ @ } else {
@ var display = (func.like(x.type,"hidden")) ? "none" : "block"; @ var display = (func.like(x.type,"hidden")) ? "none" : "block";
@ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name); @ var placeholder = (!isEmpty(x.placeholder)) ? x.placeholder : ("暂无"+x.name);
@ if(x.newline){ @ if(x.newline) {
<div class="form-group" style="display:${display!}"> <div class="form-group" style="display:${display!}">
@ } @ }
<label class="col-sm-2 control-label no-padding-right" > ${x.name!} </label> <label class="col-sm-2 control-label no-padding-right" > ${x.name!} </label>

18
src/main/webapp/WEB-INF/view/common/_header.html
View File

@ -1,11 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Blade企业级开发平台</title> <title>Blade企业级开发平台</title>
<link rel="shortcut icon" href="${ctxPath}/static/style/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="${ctxPath}/static/style/images/favicon.ico" type="image/x-icon" />
<meta name="renderer" content="webkit" /><!-- 360浏览器默认选择webkit内核 --> <!-- 360浏览器默认选择webkit内核 -->
<meta name="description" content="overview &amp; stats" /> <meta name="renderer" content="webkit" />
<meta name="description" content="blade framework" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
<script src='${ctxPath}/static/assets/js/jquery.js'></script> <script src='${ctxPath}/static/assets/js/jquery.js'></script>
<!-- bootstrap & fontawesome --> <!-- bootstrap & fontawesome -->
@ -23,16 +24,16 @@
<!-- ace settings handler --> <!-- ace settings handler -->
<script src="${ctxPath}/static/assets/js/ace-extra.js"></script> <script src="${ctxPath}/static/assets/js/ace-extra.js"></script>
<link rel="stylesheet" href="${ctxPath}/static/blade/css/blade-tab.css" type="text/css" media="screen" /> <link rel="stylesheet" href="${ctxPath}/static/blade/css/blade-tab.css" type="text/css" media="screen" />
<script src="${ctxPath}/static/blade/js/blade-tab.js"></script> <!-- layer --> <!-- layer -->
<script src="${ctxPath}/static/blade/js/blade-tab.js"></script>
<!-- blade通用工具类 -->
<script src="${ctxPath}/static/layer/layer.js"></script> <script src="${ctxPath}/static/layer/layer.js"></script>
<script src="${ctxPath}/static/blade/js/blade-ajax.js" type="text/javascript" ></script> <script src="${ctxPath}/static/blade/js/blade-ajax.js" type="text/javascript" ></script>
</head> </head>
<body class="no-skin"> <body class="no-skin">
<!-- #section:basics/navbar.layout -->
<div id="navbar" class="navbar navbar-default"> <div id="navbar" class="navbar navbar-default">
<div class="navbar-container" id="navbar-container"> <div class="navbar-container" id="navbar-container">
<!-- #section:basics/sidebar.mobile.toggle -->
<button type="button" class="navbar-toggle menu-toggler pull-left" id="menu-toggler" data-target="#sidebar"> <button type="button" class="navbar-toggle menu-toggler pull-left" id="menu-toggler" data-target="#sidebar">
<span class="sr-only">Toggle sidebar</span> <span class="sr-only">Toggle sidebar</span>
@ -43,15 +44,12 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<!-- /section:basics/sidebar.mobile.toggle -->
<div class="navbar-header pull-left"> <div class="navbar-header pull-left">
<!-- #section:basics/navbar.layout.brand -->
<a href="#" class="navbar-brand"> <a href="#" class="navbar-brand">
<small> <small>
<!-- <i class="fa fa-tumblr"></i> -->
Blade企业级开发平台 Blade企业级开发平台
</small> </small>
</a> </a>
</div> </div>
</div><!-- /.navbar-container --> </div>
</div> </div>

2
src/main/webapp/WEB-INF/view/common/_sidebar.html
View File

@ -1,5 +1,4 @@
<!-- #section:basics/sidebar -->
<div id="sidebar" class="sidebar responsive"> <div id="sidebar" class="sidebar responsive">
<script type="text/javascript"> <script type="text/javascript">
try{ace.settings.check('sidebar' , 'fixed')}catch(e){} try{ace.settings.check('sidebar' , 'fixed')}catch(e){}
@ -25,7 +24,6 @@
<blade:sidebar userId="${shiro.getUser().id}" roleId="${shiro.getUser().roles}" /> <blade:sidebar userId="${shiro.getUser().id}" roleId="${shiro.getUser().roles}" />
</ul> </ul>
<!-- #section:basics/sidebar.layout.minimize -->
<div class="sidebar-toggle sidebar-collapse" id="sidebar-collapse"> <div class="sidebar-toggle sidebar-collapse" id="sidebar-collapse">
<i class="ace-icon fa fa-angle-double-left" data-icon1="ace-icon fa fa-angle-double-left" data-icon2="ace-icon fa fa-angle-double-right"></i> <i class="ace-icon fa fa-angle-double-left" data-icon1="ace-icon fa fa-angle-double-left" data-icon2="ace-icon fa fa-angle-double-right"></i>
</div> </div>

3
src/main/webapp/static/blade/css/blade-tab.css
View File

@ -4,13 +4,12 @@
position:absolute; position:absolute;
right: 5px; right: 5px;
top: 5px; top: 5px;
/* padding-left: 25px; */
z-index: 100; z-index: 100;
cursor: pointer; cursor: pointer;
color: #94A6B0; color: #94A6B0;
} }
.tmsp-pointer{ .blade-pointer{
cursor:pointer; cursor:pointer;
} }