Skip to content

Commit be3f59c

Browse files
committed
更换My97DatePicker时间控件皮肤,符合整体样式;样式微调;修正IE10表格标题显示问题。
1 parent 0a75313 commit be3f59c

File tree

26 files changed

+366
-52
lines changed

26 files changed

+366
-52
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
##框架简介
55

6-
JeeSite 是一个 **永久开源的企业信息管理系统** 基础框架。主要定位于“企业信息管理”领域,可用作企业信息管理类系统、网站后台管理类系统等。JeeSite是非常强调开发的高效性、健壮性和安全性的。
6+
JeeSite 是一个 **开源的企业信息管理系统** 基础框架。主要定位于“企业信息管理”领域,可用作企业信息管理类系统、网站后台管理类系统等。JeeSite是非常强调开发的高效性、健壮性和安全性的。
77

88
JeeSite 是轻量级的,简单易学,本框架以Spring Framework为核心、Spring MVC作为模型视图控制器、Spring Data JPA + Hibernate作为数据库操作层,此组合是Java界业内最经典、最优的搭配组合。前端界面风格采用了结构简单、性能优良、页面精致的Twitter Bootstrap作为前端展示框架。
99

@@ -92,5 +92,5 @@ JeeSite 提供了常用工具进行封装,包括日志工具、缓存工具、
9292
* 内容管理模块:文章评论、完善内容关键字、图片模型、专题功能、会员功能。
9393
* 添加通用模块:公告功能、内部短消息、在线列表、短信和邮件群发功能。
9494
* 嵌入流程引擎:使用Activit5或JBPM5流程引擎 [【投票】](http://url.cn/BiuLiE)</a>。
95-
* 公共工具封装:导出Excel、嵌入地图、生成报表、WebService
95+
* 公共工具封装:嵌入地图、生成报表、WebService
9696
* 移动客户端:暂定为Android客户端开发

doc/JeeSite About.docx

132 Bytes
Binary file not shown.

src/main/java/com/thinkgem/jeesite/generate/Generate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
3939
// 主要提供基本功能模块代码生成。
4040
// 目录生成结构:{packageName}/{moduleName}/{dao,entity,service,web}/{subModuleName}/{className}
4141

42-
// packageName 包名,这里如果更改包名,请在applicationContext.xml和srping-mvc.xml中配置base-package、packagesToScan属性,来指定多个。
42+
// packageName 包名,这里如果更改包名,请在applicationContext.xml和srping-mvc.xml中配置base-package、packagesToScan属性,来指定多个(共4处需要修改)
4343
String packageName = "com.thinkgem.jeesite.modules";
4444

4545
String moduleName = "factory"; // 模块名,例:sys

src/main/resources/application.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#============================#
2-
#===== database sttings =====#
2+
#===== Database sttings =====#
33
#============================#
44

55
#mysql database setting
@@ -29,7 +29,7 @@ pool.maxconn=20
2929
pool.minconn=3
3030

3131
#============================#
32-
#====== global sttings ======#
32+
#====== Global sttings ======#
3333
#============================#
3434

3535
#product sttings
@@ -44,7 +44,7 @@ adminPath=/a
4444
page.pageSize=10
4545

4646
#============================#
47-
#=== spring mvc settings ====#
47+
#===== Spring settings ======#
4848
#============================#
4949

5050
#home page path

src/main/resources/applicationContext.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@
3434
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
3535
<property name="dataSource" ref="dataSource"/>
3636
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
37-
<property name="packagesToScan">
38-
<list><!-- packagesToScan 如果多个,请在加一个value -->
39-
<value>com.thinkgem.jeesite</value>
40-
</list>
41-
</property>
37+
<property name="packagesToScan" value="com.thinkgem.jeesite"/><!-- 如果多个,用“,”分隔 -->
4238
<property name="jpaProperties">
4339
<props>
4440
<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop>

src/main/webapp/WEB-INF/views/include/head.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="Pragma" content="no-cache" />
55
<meta http-equiv="Expires" content="0" />
66
<meta name="author" content="http://thinkgem.iteye.com"/>
7-
<meta http-equiv="X-UA-Compatible" content="IE=7,IE=9" />
7+
<meta http-equiv="X-UA-Compatible" content="IE=7,IE=9,IE=10" />
88
<script src="${ctxStatic}/jquery/jquery-1.9.1.min.js" type="text/javascript"></script>
99
<script src="${ctxStatic}/jquery/jquery-migrate-1.1.1.min.js" type="text/javascript"></script>
1010
<link href="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />

src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
<div class="control-group">
8080
<label class="control-label">权重:</label>
8181
<div class="controls">
82-
<form:input path="weight" htmlEscape="false" maxlength="200" class="input-mini required digits"/>&nbsp;
82+
<form:input path="weight" htmlEscape="false" maxlength="200" class="input-mini required digits"/>&nbsp;<span>
8383
<input id="weightTop" type="checkbox" onclick="$('#weight').val(this.checked?'999':'0')"><label for="weightTop">置顶</label>
84-
<span class="help-inline">数值越大排序越靠前。</span>
84+
</span><span class="help-inline">数值越大排序越靠前。</span>
8585
</div>
8686
</div>
8787
<div class="control-group">

src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,27 @@
66
<meta name="decorator" content="default"/>
77
<%@include file="/WEB-INF/views/include/treeview.jsp" %>
88
<style type="text/css">
9-
.ztree li span.button.level0, .ztree li a.level0 {display:none;}
9+
.ztree {margin-top:5px;*margin:-5px 0 5px -2px;_position:relative;_margin:0;_top:-10px;}
10+
.ztree li span.button.level0, .ztree li a.level0 {display:none;height:0;}
1011
.ztree li ul.level0 {padding:0;background:none;}
1112
</style>
1213
<script type="text/javascript">
1314
$(document).ready(function(){
1415
var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}}};
1516
var zNodes=[
16-
<c:forEach items="${categoryList}" var="category">{id:${category.id}, pId:${not empty category.parent?category.parent.id:0}, name:"${not empty category.parent?category.name:category.name}", url:"${ctx}/cms/${not empty category.module?category.module:'none'}/?category.id=${category.id}", target:"cmsMainFrame"},
17+
<c:forEach items="${categoryList}" var="category">{id:${category.id}, pId:${not empty category.parent?category.parent.id:0}, name:"${category.name}", url:"${ctx}/cms/${not empty category.module?category.module:'none'}/?category.id=${category.id}", target:"cmsMainFrame"},
1718
</c:forEach>];
1819
// 初始化树结构
1920
var tree = $.fn.zTree.init($("#tree"), setting, zNodes);
20-
// 默认展开一级节点
21-
var nodes = tree.getNodesByParam("level", 1);
21+
// 展开第一级节点
22+
var nodes = tree.getNodesByParam("level", 0);
2223
for(var i=0; i<nodes.length; i++) {
23-
tree.expandNode(nodes[i], true, false, false);
24+
tree.expandNode(nodes[i], true, true, false);
25+
}
26+
// 展开第二级节点
27+
nodes = tree.getNodesByParam("level", 1);
28+
for(var i=0; i<nodes.length; i++) {
29+
tree.expandNode(nodes[i], true, true, false);
2430
}
2531
});
2632
</script>
@@ -32,7 +38,7 @@
3238
</div>
3339
<div class="accordion-body ">
3440
<div class="accordion-inner">
35-
<div id="tree" class="ztree" style="margin-top:5px;*margin:-5px 0 0 -5px;_margin:0 0 0 -5px;"></div>
41+
<div id="tree" class="ztree"></div>
3642
</div>
3743
</div>
3844
</div>

src/main/webapp/static/My97DatePicker/WdatePicker.js

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)