diff --git a/README.md b/README.md index 2e672b5db8..f82274d3ee 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ##框架简介 -JeeSite 是一个 **永久开源的企业信息管理系统** 基础框架。主要定位于“企业信息管理”领域，可用作企业信息管理类系统、网站后台管理类系统等。JeeSite是非常强调开发的高效性、健壮性和安全性的。 +JeeSite 是一个 **开源的企业信息管理系统** 基础框架。主要定位于“企业信息管理”领域，可用作企业信息管理类系统、网站后台管理类系统等。JeeSite是非常强调开发的高效性、健壮性和安全性的。 JeeSite 是轻量级的，简单易学，本框架以Spring Framework为核心、Spring MVC作为模型视图控制器、Spring Data JPA + Hibernate作为数据库操作层，此组合是Java界业内最经典、最优的搭配组合。前端界面风格采用了结构简单、性能优良、页面精致的Twitter Bootstrap作为前端展示框架。 @@ -92,5 +92,5 @@ JeeSite 提供了常用工具进行封装，包括日志工具、缓存工具、 * 内容管理模块：文章评论、完善内容关键字、图片模型、专题功能、会员功能。 * 添加通用模块：公告功能、内部短消息、在线列表、短信和邮件群发功能。 * 嵌入流程引擎：使用Activit5或JBPM5流程引擎 [【投票】](http://url.cn/BiuLiE)。 -* 公共工具封装：导出Excel、嵌入地图、生成报表、WebService +* 公共工具封装：嵌入地图、生成报表、WebService * 移动客户端：暂定为Android客户端开发 diff --git a/doc/JeeSite About.docx b/doc/JeeSite About.docx index 8b86ce7f1b..1a8d4a4ff8 100644 Binary files a/doc/JeeSite About.docx and b/doc/JeeSite About.docx differ diff --git a/src/main/java/com/thinkgem/jeesite/generate/Generate.java b/src/main/java/com/thinkgem/jeesite/generate/Generate.java index 2fa10359b5..88d82c7036 100644 --- a/src/main/java/com/thinkgem/jeesite/generate/Generate.java +++ b/src/main/java/com/thinkgem/jeesite/generate/Generate.java @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception { // 主要提供基本功能模块代码生成。 // 目录生成结构：{packageName}/{moduleName}/{dao,entity,service,web}/{subModuleName}/{className} - // packageName 包名，这里如果更改包名，请在applicationContext.xml和srping-mvc.xml中配置base-package、packagesToScan属性，来指定多个。 + // packageName 包名，这里如果更改包名，请在applicationContext.xml和srping-mvc.xml中配置base-package、packagesToScan属性，来指定多个（共4处需要修改）。 String packageName = "com.thinkgem.jeesite.modules"; String moduleName = "factory"; // 模块名，例：sys diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 547dd39c9b..0f6c8300b3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ #============================# -#===== database sttings =====# +#===== Database sttings =====# #============================# #mysql database setting @@ -29,7 +29,7 @@ pool.maxconn=20 pool.minconn=3 #============================# -#====== global sttings ======# +#====== Global sttings ======# #============================# #product sttings @@ -44,7 +44,7 @@ adminPath=/a page.pageSize=10 #============================# -#=== spring mvc settings ====# +#===== Spring settings ======# #============================# #home page path diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index ef724ee653..bfde5a8e19 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -34,11 +34,7 @@ - - - com.thinkgem.jeesite - - + org.hibernate.cache.ehcache.EhCacheRegionFactory diff --git a/src/main/webapp/WEB-INF/views/include/head.jsp b/src/main/webapp/WEB-INF/views/include/head.jsp index 04f416e8bf..9d4b6083bc 100644 --- a/src/main/webapp/WEB-INF/views/include/head.jsp +++ b/src/main/webapp/WEB-INF/views/include/head.jsp @@ -4,7 +4,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp b/src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp index bdc0f2d451..fcf3f5983d 100644 --- a/src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp +++ b/src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp @@ -79,9 +79,9 @@
-   +   - 数值越大排序越靠前。 + 数值越大排序越靠前。
diff --git a/src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp b/src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp index fce658512c..c601e971d9 100644 --- a/src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp +++ b/src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp @@ -6,21 +6,27 @@ <%@include file="/WEB-INF/views/include/treeview.jsp" %> @@ -32,7 +38,7 @@
-
+
diff --git a/src/main/webapp/static/My97DatePicker/WdatePicker.js b/src/main/webapp/static/My97DatePicker/WdatePicker.js index f6b77bc267..687bb408f0 100644 --- a/src/main/webapp/static/My97DatePicker/WdatePicker.js +++ b/src/main/webapp/static/My97DatePicker/WdatePicker.js @@ -7,10 +7,7 @@ $langList:[{name:"en",charset:"UTF-8"},{name:"zh-cn",charset:"UTF-8"},{name:"zh- $skinList:[ {name:"default",charset:"gb2312"}, {name:"whyGreen",charset:"gb2312"}, - {name:"blue",charset:"gb2312"}, - {name:"green",charset:"gb2312"}, - {name:"ext",charset:"gb2312"}, - {name:"blueFresh",charset:"gb2312"} + {name:"twoer",charset:"gb2312"} ], $wdate:true, $crossFrame:true, @@ -22,7 +19,7 @@ autoUpdateOnChanged:null, weekMethod:"ISO8601", position:{}, lang:"auto", -skin:"default", +skin:"twoer", dateFmt:"yyyy-MM-dd", realDateFmt:"yyyy-MM-dd", realTimeFmt:"HH:mm:ss", @@ -44,5 +41,4 @@ errDealMode:0, autoPickDate:null, qsEnabled:true, autoShowQS:false, - specialDates:null,specialDays:null,disabledDates:null,disabledDays:null,opposite:false,onpicking:null,onpicked:null,onclearing:null,oncleared:null,ychanging:null,ychanged:null,Mchanging:null,Mchanged:null,dchanging:null,dchanged:null,Hchanging:null,Hchanged:null,mchanging:null,mchanged:null,schanging:null,schanged:null,eCont:null,vel:null,elProp:"",errMsg:"",quickSel:[],has:{},getRealLang:function(){var _=$.$langList;for(var A=0;A<_.length;A++)if(_[A].name==this.lang)return _[A];return _[0]}};WdatePicker=T;var X=window,S={innerHTML:""},M="document",H="documentElement",C="getElementsByTagName",U,A,R,G,a,W=navigator.appName;if(W=="Microsoft Internet Explorer")R=true;else if(W=="Opera")a=true;else G=true;A=J();if($.$wdate)K(A+"skin/WdatePicker.css");U=X;if($.$crossFrame){try{while(U.parent&&U.parent[M]!=U[M]&&U.parent[M][C]("frameset").length==0)U=U.parent}catch(N){}}if(!U.$dp)U.$dp={ff:G,ie:R,opera:a,status:0,defMinDate:$.minDate,defMaxDate:$.maxDate};B();if($.$preLoad&&$dp.status==0)E(X,"onload",function(){T(null,true)});if(!X[M].docMD){E(X[M],"onmousedown",D);X[M].docMD=true}if(!U[M].docMD){E(U[M],"onmousedown",D);U[M].docMD=true}E(X,"onunload",function(){if($dp.dd)O($dp.dd,"none")});function B(){U.$dp=U.$dp||{};obj={$:function($){return(typeof $=="string")?X[M].getElementById($):$},$D:function($,_){return this.$DV(this.$($).value,_)},$DV:function(_,$){if(_!=""){this.dt=$dp.cal.splitDate(_,$dp.cal.dateFmt);if($)for(var B in $)if(this.dt[B]===undefined)this.errMsg="invalid property:"+B;else{this.dt[B]+=$[B];if(B=="M"){var C=$["M"]>0?1:0,A=new Date(this.dt["y"],this.dt["M"],0).getDate();this.dt["d"]=Math.min(A+C,this.dt["d"])}}if(this.dt.refresh())return this.dt}return""},show:function(){var A=U[M].getElementsByTagName("div"),$=100000;for(var B=0;B$)$=_}this.dd.style.zIndex=$+2;O(this.dd,"block")},hide:function(){O(this.dd,"none")},attachEvent:E};for(var $ in obj)U.$dp[$]=obj[$];$dp=U.$dp}function E(A,$,_){if(R)A.attachEvent($,_);else if(_){var B=$.replace(/on/,"");_._ieEmuEventHandler=function($){return _($)};A.addEventListener(B,_._ieEmuEventHandler,false)}}function J(){var _,A,$=X[M][C]("script");for(var B=0;B<$.length;B++){_=$[B].getAttribute("src")||"";_=_.substr(0,_.toLowerCase().indexOf("wdatepicker.js"));A=_.lastIndexOf("/");if(A>0)_=_.substring(0,A+1);if(_)break}return _}function K(A,$,B){var D=X[M][C]("HEAD").item(0),_=X[M].createElement("link");if(D){_.href=A;_.rel="stylesheet";_.type="text/css";if($)_.title=$;if(B)_.charset=B;D.appendChild(_)}}function F($){$=$||U;var A=0,_=0;while($!=U){var D=$.parent[M][C]("iframe");for(var F=0;F_.scrollTop||A.scrollLeft>_.scrollLeft))?A:_;return{"top":B.scrollTop,"left":B.scrollLeft}}function D($){var _=$?($.srcElement||$.target):null;try{if($dp.cal&&!$dp.eCont&&$dp.dd&&_!=$dp.el&&$dp.dd.style.display=="block")$dp.cal.close()}catch($){}}function Y(){$dp.status=2}var P,_;function T(N,F){$dp.win=X;B();N=N||{};for(var K in $)if(K.substring(0,1)!="$"&&N[K]===undefined)N[K]=$[K];if(F){if(!L()){_=_||setInterval(function(){if(U[M].readyState=="complete")clearInterval(_);T(null,true)},50);return}if($dp.status==0){$dp.status=1;N.el=S;I(N,true)}else return}else if(N.eCont){N.eCont=$dp.$(N.eCont);N.el=S;N.autoPickDate=true;N.qsEnabled=false;I(N)}else{if($.$preLoad&&$dp.status!=2)return;var J=H();if(J){N.srcEl=J.srcElement||J.target;J.cancelBubble=true}N.el=N.el=$dp.$(N.el||N.srcEl);if(!N.el||N.el["My97Mark"]===true||N.el.disabled||($dp.dd&&O($dp.dd)!="none"&&$dp.dd.style.left!="-970px")){try{N.el["My97Mark"]=false}catch(C){}return}I(N);if(J&&N.el.nodeType==1&&N.el["My97Mark"]===undefined){var A,D;if(J.type=="focus"){A="onclick";D="onfocus"}else{A="onfocus";D="onclick"}E(N.el,A,N.el[D])}}function L(){if(R&&U!=X&&U[M].readyState!="complete")return false;return true}function H(){if(G){func=H.caller;while(func!=null){var $=func.arguments[0];if($&&($+"").indexOf("Event")>=0)return $;func=func.caller}return null}return event}}function Q(_,$){return _.currentStyle?_.currentStyle[$]:document.defaultView.getComputedStyle(_,false)[$]}function O(_,$){if(_)if($!=null)_.style.display=$;else return Q(_,"display")}function I(G,_){var D=G.el?G.el.nodeName:"INPUT";if(_||G.eCont||new RegExp(/input|textarea|div|span|p|a/ig).test(D))G.elProp=D=="INPUT"?"value":"innerHTML";else return;if(G.lang=="auto")G.lang=R?navigator.browserLanguage.toLowerCase():navigator.language.toLowerCase();if(!G.eCont)for(var C in G)$dp[C]=G[C];if(!$dp.dd||G.eCont||($dp.dd&&(G.getRealLang().name!=$dp.dd.lang||G.skin!=$dp.dd.skin))){if(G.eCont)E(G.eCont,G);else{$dp.dd=U[M].createElement("DIV");$dp.dd.style.cssText="position:absolute";U[M].body.appendChild($dp.dd);E($dp.dd,G);if(_)$dp.dd.style.left=$dp.dd.style.top="-970px";else{$dp.show();B($dp)}}}else if($dp.cal){$dp.show();$dp.cal.init();if(!$dp.eCont)B($dp)}function E(F,E){F.innerHTML="";var D=F.lastChild.contentWindow[M],_=$.$langList,C=$.$skinList,H=E.getRealLang();F.lang=H.name;F.skin=E.skin;var G=[""];for(var I=0;I");G.push("");G.push("");G.push("");E.setPos=B;E.onload=Y;D.write("");D.cfg=E;D.write(G.join(""))}function B(I){var G=I.position.left,B=I.position.top,C=I.el;if(C==S)return;if(C!=I.srcEl&&(O(C)=="none"||C.type=="hidden"))C=I.srcEl;var H=V(C),$=F(X),D=L(U),A=Z(U),E=$dp.dd.offsetHeight,_=$dp.dd.offsetWidth;if(isNaN(B))B=0;if(($.topM+H.bottom+E>D.height)&&($.topM+H.top-E>0))B+=A.top+$.topM+H.top-E-2;else B+=A.top+$.topM+Math.min(H.bottom,D.height-E)+2;if(isNaN(G))G=0;G+=A.left+Math.min($.leftM+H.left,D.width-_-5)-(R?2:0);I.dd.style.top=B+"px";I.dd.style.left=G+"px"}}})() \ No newline at end of file diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" b/src/main/webapp/static/My97DatePicker/develop/lang/zh-cn.js similarity index 100% rename from "src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-cn.js" rename to src/main/webapp/static/My97DatePicker/develop/lang/zh-cn.js diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" b/src/main/webapp/static/My97DatePicker/develop/lang/zh-tw.js similarity index 100% rename from "src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/zh-tw.js" rename to src/main/webapp/static/My97DatePicker/develop/lang/zh-tw.js diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" b/src/main/webapp/static/My97DatePicker/develop/readme.txt similarity index 100% rename from "src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/readme.txt" rename to src/main/webapp/static/My97DatePicker/develop/readme.txt diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" b/src/main/webapp/static/My97DatePicker/develop/skin/default/datepicker.css similarity index 100% rename from "src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/datepicker.css" rename to src/main/webapp/static/My97DatePicker/develop/skin/default/datepicker.css diff --git a/src/main/webapp/static/My97DatePicker/develop/skin/twoer/datepicker.css b/src/main/webapp/static/My97DatePicker/develop/skin/twoer/datepicker.css new file mode 100644 index 0000000000..05e73184e9 --- /dev/null +++ b/src/main/webapp/static/My97DatePicker/develop/skin/twoer/datepicker.css @@ -0,0 +1,339 @@ +/* + * My97 DatePicker 4.8 + * auther : zhangkun , hejianting(design) + * email : zhangkun_net@hotmail.com + * date : 2012-05-25 + */ +.WdateDiv +{ + position:relative; + padding:5px; + width:180px; + *width:190px; + font-size:12px; + color:#333; + border:solid 1px #DEDEDE; + background-color:#F2F0F1; +} + +.WdateDiv2 +{ + width:360px; +} + +.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS +{ + background:url(img.gif) no-repeat; +} + +.WdateDiv .NavImg a +{ + float:left; + width:16px; + height:16px; + cursor:pointer; +} +.WdateDiv .NavImgll a +{ + background-position:0px 5px; +} +.WdateDiv .NavImgl a +{ + background-position:0px -10px; +} +.WdateDiv .NavImgr a +{ + background-position:0px -25px; + float:right; +} +.WdateDiv .NavImgrr a +{ + background-position:0px -40px; + float:right; +} + +.WdateDiv #dpTitle +{ + padding:3px 0px 0px 0px; + line-height:0px; + height:20px; + *height:23; +} + +.WdateDiv .yminput,.WdateDiv .yminputfocus +{ + margin-left:3px; + width:50px; + height:20px; + line-height:16px; + border:solid 1px #F2F0F1; + cursor:pointer; + background-position:35px -68px; +} + +.WdateDiv .yminputfocus +{ + background-color:#fff; + border:solid 1px #D8D8D8; +} + +.WdateDiv .menuSel{ + z-index:1; + position:absolute; + background-color:#FFFFFF; + border:#A3C6C8 1px solid; + display:none; +} + +.WdateDiv .menu +{ + background:#fff; +} +.WdateDiv .menuOn +{ + color:#fff; + background:#0088CC; +} + +.WdateDiv .invalidMenu{ + color:#aaa; +} + +.WdateDiv .MMenu,.WdateDiv .YMenu +{ + padding:2px; + margin-top:20px; + margin-left:-1px; + width:68px; + border:solid 1px #D9D9D9; +} +.WdateDiv .MMenu table,.WdateDiv .YMenu table +{ + width:100%; +} +.WdateDiv .MMenu table td,.WdateDiv .YMenu table td +{ + padding:0px; + line-height:20px; + text-align:center; + font-size:12px; + cursor: pointer; +} + +.WdateDiv .Wweek { + text-align:center; + background:#DAF3F5; + border-right:#BDEBEE 1px solid; + } + +.WdateDiv td +{ + padding:1px; + line-height:20px; + font-size:12px; + color:#999999; + background:#fff; + cursor:pointer; +} +.WdateDiv .MTitle td +{ + line-height:24px; + color:#7D7D7D; + background:#F2F0F1; + cursor: default; +} + +.WdateDiv .WdayTable2 +{ + border-collapse:collapse; + border:#808080 1px solid; +} +.WdateDiv .WdayTable2 table +{ + border:0; +} + +.WdateDiv .WdayTable{ + line-height:20px; + color:#13777e; + background-color:#edfbfb; +} +.WdateDiv .WdayTable td{ + text-align:center; +} + +.WdateDiv .Wday +{ + color:#323232; +} + +.WdateDiv .WdayOn +{ + color:#fff; + background-color:#0088CC; +} + +.WdateDiv .Wwday +{ + color:#0088CC; +} + +.WdateDiv .WwdayOn +{ + color:#fff; + background-color:#0088CC; +} +.WdateDiv .Wtoday +{ + color:#FF6D10; + background:#E0EDFE; +} +.WdateDiv .Wselday +{ + color:#fff; + background-color:#0088CC; +} +.WdateDiv .WspecialDay{ + background-color:#66F4DF; +} + +.WdateDiv .WotherDay +{ + color:#D4D4D4; +} +.WdateDiv .WotherDayOn +{ + color:#fff; + background-color:#0088CC; +} + +.WdateDiv .WinvalidDay{ + color:#aaa; +} + +.WdateDiv #dpTime +{ + position:relative; + margin-top:5px; +} + +.WdateDiv #dpTime #dpTimeStr +{ + display:inline-block; + width:28px; + *width:30px; + color:#7d7d7d; +} + +.WdateDiv #dpTime input +{ + padding:0px; + margin:0px; + width:25px; + height:20px; + line-height:20px; + text-align:center; + color:#333; + border:#D9D9D9 1px solid; +} + +.WdateDiv #dpTime .tm +{ + width:7px; + border:none; + background:#F2F0F1; +} + +.WdateDiv #dpTime #dpTimeUp +{ + display:none; +} + +.WdateDiv #dpTime #dpTimeDown +{ + display:none; +} + +.WdateDiv #dpQS + { + float:left; + margin-right:3px; + margin-top:9px; + *margin-top:6px; + width:16px; + height:16px; + cursor:pointer; + background-position:0px -90px; + } +.WdateDiv #dpControl +{ + text-align:right; + margin-top:3px; +} +.WdateDiv .dpButton +{ + margin-left:2px; + line-height:18px; + *line-height:16px; + width:45px; + background-color:#C3C3C3; + *background-color:#0055CC; + color:#fff; + border:none; + cursor: pointer; +} +.WdateDiv .dpButton:hover +{ + background-color:#0663A2; +} + +.WdateDiv .hhMenu, +.WdateDiv .mmMenu, +.WdateDiv .ssMenu +{ + position:absolute; + padding:3px; + font-size:12px; + color:#333; + border:solid 1px #DEDEDE; + background-color:#F2F0F1; +} + +.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn +{ + width:18px; + height:18px; + line-height:18px; + text-align:center; + background:#fff; +} +.WdateDiv #dpTime .menuOn +{ + background:#0088CC; +} + +.WdateDiv #dpTime td +{ + background:#F2F0F1; +} + +.WdateDiv .hhMenu +{ + top:-87px; + left:35px; + left:32px\9; +} + +.WdateDiv .mmMenu +{ + top:-47px; + left:35px; + left:32px\9; +} + +.WdateDiv .ssMenu +{ + top:-27px; + left:35px; + left:32px\9; +} \ No newline at end of file diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" b/src/main/webapp/static/My97DatePicker/develop/skin/whyGreen/datepicker.css similarity index 100% rename from "src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/datepicker.css" rename to src/main/webapp/static/My97DatePicker/develop/skin/whyGreen/datepicker.css diff --git a/src/main/webapp/static/My97DatePicker/skin/twoer/datepicker.css b/src/main/webapp/static/My97DatePicker/skin/twoer/datepicker.css new file mode 100644 index 0000000000..dbb7d4346f --- /dev/null +++ b/src/main/webapp/static/My97DatePicker/skin/twoer/datepicker.css @@ -0,0 +1 @@ +.WdateDiv{position:relative;width:190px;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:5px;}.WdateDiv2{width:360px;}.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS{background:url(img.gif) no-repeat;}.WdateDiv .NavImg a{float:left;width:16px;height:16px;cursor:pointer;}.WdateDiv .NavImgll a{background-position:0 5px;}.WdateDiv .NavImgl a{background-position:0 -10px;}.WdateDiv .NavImgr a{background-position:0 -25px;float:right;}.WdateDiv .NavImgrr a{background-position:0 -40px;float:right;}.WdateDiv #dpTitle{line-height:0;height:23px;padding:3px 0 0;}.WdateDiv .yminput,.WdateDiv .yminputfocus{margin-left:3px;width:50px;height:20px;line-height:16px;border:solid 1px #F2F0F1;cursor:pointer;background-position:35px -68px;}.WdateDiv .yminputfocus{background-color:#fff;border:solid 1px #D8D8D8;}.WdateDiv .menuSel{z-index:1;position:absolute;background-color:#FFF;border:#A3C6C8 1px solid;display:none;}.WdateDiv .menu{background:#fff;}.WdateDiv .menuOn{color:#fff;background:#0088CC;}.WdateDiv .MMenu,.WdateDiv .YMenu{margin-top:20px;margin-left:-1px;width:68px;border:solid 1px #D9D9D9;padding:2px;}.WdateDiv .MMenu table,.WdateDiv .YMenu table{width:100%;}.WdateDiv .MMenu table td,.WdateDiv .YMenu table td{line-height:20px;text-align:center;font-size:12px;cursor:pointer;padding:0;}.WdateDiv .Wweek{text-align:center;background:#DAF3F5;border-right:#BDEBEE 1px solid;}.WdateDiv td{line-height:20px;font-size:12px;color:#999;background:#fff;cursor:pointer;padding:1px;}.WdateDiv .MTitle td{line-height:24px;color:#7D7D7D;background:#F2F0F1;cursor:default;}.WdateDiv .WdayTable2{border-collapse:collapse;border:gray 1px solid;}.WdateDiv .WdayTable2 table{border:0;}.WdateDiv .WdayTable{line-height:20px;color:#13777e;background-color:#edfbfb;}.WdateDiv .WdayTable td{text-align:center;}.WdateDiv .Wday{color:#323232;}.WdateDiv .Wwday{color:#0088CC;}.WdateDiv .Wtoday{color:#FF6D10;background:#E0EDFE;}.WdateDiv .WspecialDay{background-color:#66F4DF;}.WdateDiv .WotherDay{color:#D4D4D4;}.WdateDiv #dpTime{position:relative;margin-top:5px;}.WdateDiv #dpTime #dpTimeStr{display:inline-block;width:30px;color:#7d7d7d;}.WdateDiv #dpTime input{width:25px;height:20px;line-height:20px;text-align:center;color:#333;border:#D9D9D9 1px solid;margin:0;padding:0;}.WdateDiv #dpTime .tm{width:7px;border:none;background:#F2F0F1;}.WdateDiv #dpQS{float:left;margin-right:3px;margin-top:6px;width:16px;height:16px;cursor:pointer;background-position:0 -90px;}.WdateDiv #dpControl{text-align:right;margin-top:3px;}.WdateDiv .dpButton{margin-left:2px;line-height:16px;width:45px;background-color:#0055CC;color:#fff;border:none;cursor:pointer;}.WdateDiv .dpButton:hover{background-color:#0663A2;}.WdateDiv .hhMenu,.WdateDiv .mmMenu,.WdateDiv .ssMenu{position:absolute;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:3px;}.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn{width:18px;height:18px;line-height:18px;text-align:center;background:#fff;}.WdateDiv #dpTime .menuOn{background:#0088CC;}.WdateDiv #dpTime td{background:#F2F0F1;}.WdateDiv .hhMenu{top:-87px;left:32px;}.WdateDiv .mmMenu{top:-47px;left:32px;}.WdateDiv .ssMenu{top:-27px;left:32px;}.WdateDiv .invalidMenu,.WdateDiv .WinvalidDay{color:#aaa;}.WdateDiv .WdayOn,.WdateDiv .WwdayOn,.WdateDiv .Wselday,.WdateDiv .WotherDayOn{background-color:#0088CC;color:#fff;}.WdateDiv #dpTime #dpTimeUp,.WdateDiv #dpTime #dpTimeDown{display:none;} \ No newline at end of file diff --git a/src/main/webapp/static/My97DatePicker/skin/twoer/img.gif b/src/main/webapp/static/My97DatePicker/skin/twoer/img.gif new file mode 100644 index 0000000000..da838ce887 Binary files /dev/null and b/src/main/webapp/static/My97DatePicker/skin/twoer/img.gif differ diff --git a/src/main/webapp/static/My97DatePicker/skin/twoer/img.png b/src/main/webapp/static/My97DatePicker/skin/twoer/img.png new file mode 100644 index 0000000000..99960d8daf Binary files /dev/null and b/src/main/webapp/static/My97DatePicker/skin/twoer/img.png differ diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/en.js" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/en.js" deleted file mode 100644 index 315988545a..0000000000 --- "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/lang/en.js" +++ /dev/null @@ -1,14 +0,0 @@ -var $lang={ -errAlertMsg: "Invalid date or the date out of range,redo or not?", -aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], -aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"], -aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], -aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"], -clearStr: "Clear", -todayStr: "Today", -okStr: "OK", -updateStr: "OK", -timeStr: "Time", -quickStr: "Quick Selection", -err_1: 'MinDate Cannot be bigger than MaxDate!' -} \ No newline at end of file diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/WdatePicker.css" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/WdatePicker.css" deleted file mode 100644 index 8d447b574e..0000000000 --- "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/WdatePicker.css" +++ /dev/null @@ -1,10 +0,0 @@ -.Wdate{ - border:#999 1px solid; - height:20px; - background:#fff url(datePicker.gif) no-repeat right; -} - -.WdateFmtErr{ - font-weight:bold; - color:red; -} \ No newline at end of file diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/datePicker.gif" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/datePicker.gif" deleted file mode 100644 index d6bf40c9f2..0000000000 Binary files "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/datePicker.gif" and /dev/null differ diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/img.gif" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/img.gif" deleted file mode 100644 index 053205d820..0000000000 Binary files "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/default/img.gif" and /dev/null differ diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/bg.jpg" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/bg.jpg" deleted file mode 100644 index 75516a6380..0000000000 Binary files "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/bg.jpg" and /dev/null differ diff --git "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/img.gif" "b/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/img.gif" deleted file mode 100644 index 4003f20fb1..0000000000 Binary files "a/src/main/webapp/static/My97DatePicker/\345\274\200\345\217\221\345\214\205/skin/whyGreen/img.gif" and /dev/null differ diff --git a/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.css b/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.css index ddebfb2a35..2df01b292c 100644 --- a/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.css +++ b/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.css @@ -18,7 +18,7 @@ website: http://code.google.com/p/jquerytree/ text-decoration:none; vertical-align:top; display: inline-block} .ztree li a:hover {text-decoration:underline} /*.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}*/ -.ztree li a.curSelectedNode {padding-top:0px; background-color:#F6F6F6; color:#0663A2; height:16px; border:1px #DDDDDD solid; opacity:0.8;} +.ztree li a.curSelectedNode {padding-top:0px; background-color:#F6F6F6; color:#0663A2; height:16px; border:1px #DDDDDD solid; opacity:0.8;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} /*.ztree li a.curSelectedNode {padding-top:0px; color:#0663a2; font-weight:bold; height:16px; opacity:0.8;}*/ .ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;} .ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid; diff --git a/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css b/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css index b995b65c47..e0c8788d2c 100644 --- a/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css +++ b/src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css @@ -1,3 +1,3 @@ -.ztree *{padding:0;margin:0;font-size:12px;font-family:Verdana,Arial,Helvetica,AppleGothic,sans-serif}.ztree{margin:0;padding:2px;color:#333}.ztree li{padding:0;margin:0;list-style:none;line-height:14px;text-align:left;white-space:nowrap;outline:0}.ztree li ul{margin:0;padding:0 0 0 18px}.ztree li ul.line{background:url(./img/line_conn.gif) 0 0 repeat-y}.ztree li a{padding:1px 3px 0 0;margin:0;cursor:pointer;height:17px;color:#333;background-color:transparent;text-decoration:none;vertical-align:top;display:inline-block}.ztree li a:hover{text-decoration:underline}.ztree li a.curSelectedNode{padding-top:0;background-color:#f6f6f6;color:#0663a2;height:16px;border:1px #ddd solid;opacity:.8}.ztree li a.curSelectedNode_Edit{padding-top:0;background-color:#ffe6b0;color:black;height:16px;border:1px #ffb951 solid;opacity:.8}.ztree li a.tmpTargetNode_inner{padding-top:0;background-color:#316ac5;color:white;height:16px;border:1px #316ac5 solid;opacity:.8;filter:alpha(opacity=80)}.ztree li a input.rename{height:14px;width:80px;padding:0;margin:0;font-size:12px;border:1px #7ec4cc solid;*border:0}.ztree li span{line-height:16px;margin-right:2px}.ztree li span.button{line-height:0;margin:0;width:16px;height:16px;display:inline-block;vertical-align:middle;border:0 none;cursor:pointer;outline:0;background-color:transparent;background-repeat:no-repeat;background-attachment:scroll;background-image:url("./img/zTreeStandard.png");*background-image:url("./img/zTreeStandard.gif")}.ztree li span.button.level0{*margin-left:-15px}.ztree li span.button.chk{width:13px;height:13px;margin:0 3px 0 0;cursor:auto}.ztree li span.button.chk.checkbox_false_full{background-position:0 0}.ztree li span.button.chk.checkbox_false_full_focus{background-position:0 -14px}.ztree li span.button.chk.checkbox_false_part{background-position:0 -28px}.ztree li span.button.chk.checkbox_false_part_focus{background-position:0 -42px}.ztree li span.button.chk.checkbox_false_disable{background-position:0 -56px}.ztree li span.button.chk.checkbox_true_full{background-position:-14px 0} +.ztree *{padding:0;margin:0;font-size:12px;font-family:Verdana,Arial,Helvetica,AppleGothic,sans-serif}.ztree{margin:0;padding:2px;color:#333}.ztree li{padding:0;margin:0;list-style:none;line-height:14px;text-align:left;white-space:nowrap;outline:0}.ztree li ul{margin:0;padding:0 0 0 18px}.ztree li ul.line{background:url(./img/line_conn.gif) 0 0 repeat-y}.ztree li a{padding:1px 3px 0 0;margin:0;cursor:pointer;height:17px;color:#333;background-color:transparent;text-decoration:none;vertical-align:top;display:inline-block}.ztree li a:hover{text-decoration:underline}.ztree li a.curSelectedNode{padding-top:0;background-color:#f6f6f6;color:#0663a2;height:16px;border:1px #ddd solid;opacity:.8;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.ztree li a.curSelectedNode_Edit{padding-top:0;background-color:#ffe6b0;color:black;height:16px;border:1px #ffb951 solid;opacity:.8}.ztree li a.tmpTargetNode_inner{padding-top:0;background-color:#316ac5;color:white;height:16px;border:1px #316ac5 solid;opacity:.8;filter:alpha(opacity=80)}.ztree li a input.rename{height:14px;width:80px;padding:0;margin:0;font-size:12px;border:1px #7ec4cc solid;*border:0}.ztree li span{line-height:16px;margin-right:2px}.ztree li span.button{line-height:0;margin:0;width:16px;height:16px;display:inline-block;vertical-align:middle;border:0 none;cursor:pointer;outline:0;background-color:transparent;background-repeat:no-repeat;background-attachment:scroll;background-image:url("./img/zTreeStandard.png");*background-image:url("./img/zTreeStandard.gif")}.ztree li span.button.level0{*margin-left:-15px}.ztree li span.button.chk{width:13px;height:13px;margin:0 3px 0 0;cursor:auto}.ztree li span.button.chk.checkbox_false_full{background-position:0 0}.ztree li span.button.chk.checkbox_false_full_focus{background-position:0 -14px}.ztree li span.button.chk.checkbox_false_part{background-position:0 -28px}.ztree li span.button.chk.checkbox_false_part_focus{background-position:0 -42px}.ztree li span.button.chk.checkbox_false_disable{background-position:0 -56px}.ztree li span.button.chk.checkbox_true_full{background-position:-14px 0} .ztree li span.button.chk.checkbox_true_full_focus{background-position:-14px -14px}.ztree li span.button.chk.checkbox_true_part{background-position:-14px -28px}.ztree li span.button.chk.checkbox_true_part_focus{background-position:-14px -42px}.ztree li span.button.chk.checkbox_true_disable{background-position:-14px -56px}.ztree li span.button.chk.radio_false_full{background-position:-28px 0}.ztree li span.button.chk.radio_false_full_focus{background-position:-28px -14px}.ztree li span.button.chk.radio_false_part{background-position:-28px -28px}.ztree li span.button.chk.radio_false_part_focus{background-position:-28px -42px}.ztree li span.button.chk.radio_false_disable{background-position:-28px -56px}.ztree li span.button.chk.radio_true_full{background-position:-42px 0}.ztree li span.button.chk.radio_true_full_focus{background-position:-42px -14px}.ztree li span.button.chk.radio_true_part{background-position:-42px -28px}.ztree li span.button.chk.radio_true_part_focus{background-position:-42px -42px}.ztree li span.button.chk.radio_true_disable{background-position:-42px -56px}.ztree li span.button.switch{width:18px;height:18px}.ztree li span.button.root_open{background-position:-92px -54px}.ztree li span.button.root_close{background-position:-74px -54px}.ztree li span.button.roots_open{background-position:-92px 0}.ztree li span.button.roots_close{background-position:-74px 0}.ztree li span.button.center_open{background-position:-92px -18px}.ztree li span.button.center_close{background-position:-74px -18px}.ztree li span.button.bottom_open{background-position:-92px -36px}.ztree li span.button.bottom_close{background-position:-74px -36px}.ztree li span.button.noline_open{background-position:-92px -72px}.ztree li span.button.noline_close{background-position:-74px -72px}.ztree li span.button.root_docu{background:0}.ztree li span.button.roots_docu{background-position:-56px 0}.ztree li span.button.center_docu{background-position:-56px -18px}.ztree li span.button.bottom_docu{background-position:-56px -36px}.ztree li span.button.noline_docu{background:0} .ztree li span.button.ico_open{margin-right:2px;background-position:-110px -16px;vertical-align:top;*vertical-align:middle}.ztree li span.button.ico_close{margin-right:2px;background-position:-110px 0;vertical-align:top;*vertical-align:middle}.ztree li span.button.ico_docu{margin-right:2px;background-position:-110px -32px;vertical-align:top;*vertical-align:middle}.ztree li span.button.edit{margin-right:2px;background-position:-110px -48px;vertical-align:top;*vertical-align:middle}.ztree li span.button.remove{margin-right:2px;background-position:-110px -64px;vertical-align:top;*vertical-align:middle}.ztree li span.button.ico_loading{margin-right:2px;background:url(./img/loading.gif) no-repeat scroll 0 0 transparent;vertical-align:top;*vertical-align:middle}ul.tmpTargetzTree{background-color:#ffe6b0;opacity:.8;filter:alpha(opacity=80)}span.tmpzTreeMove_arrow{width:16px;height:16px;display:inline-block;padding:0;margin:2px 0 0 1px;border:0 none;position:absolute;background-color:transparent;background-repeat:no-repeat;background-attachment:scroll;background-position:-110px -80px;background-image:url("./img/zTreeStandard.png");*background-image:url("./img/zTreeStandard.gif")}ul.ztree.zTreeDragUL{margin:0;padding:0;position:absolute;width:auto;height:auto;overflow:hidden;background-color:#cfcfcf;border:1px #00b83f dotted;opacity:.8;filter:alpha(opacity=80)}.zTreeMask{z-index:10000;background-color:#cfcfcf;opacity:.0;filter:alpha(opacity=0);position:absolute} \ No newline at end of file