更换日期选择控件，采用daterangepicker取代原来的calendar

src/dede/css/base.css

@@ -1,2 +1,643 @@
-*{font-size:12px;font-family:"宋体";}td{line-height:1.5;}body{font-size:12px;line-height:1.5;font-family:"宋体";background-color:#FFF;}form,h1,h2,h3,ul,ol,div{margin:0;padding:0;}td,th,div{word-break:break-all;word-wrap:break-word;}b,strong{color:#666600;}li,dd{list-style-type:none;margin:0px;padding:0px;}input{border:1px solid #ababab;zoom:expression(function(ele){(ele.type=='button'||ele.type=='submit'||ele.type=='reset') ?	ele.className='coolbg':(ele.type=='text' ?	ele.className='alltxt':'');(ele.type=='radio'||ele.type=='checkbox') ?	ele.className='np':'';ele.style.zoom = '1';}(this));}input{background:url(../images/input.png) repeat-x scroll 0px 0px;}select{padding:3px;}input[type="button"],input[type="submit"],input[type="reset"]{border:none;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background-color:#F1F8B4;padding:2px;padding-right:5px;padding-left:5px;background:url(../images/allbtbg2.gif) #EFF7D0;cursor:pointer;}input[type="text"],input[type="password"]{border-width:1px;border-style:solid;border-color:#707070 #CECECE #CECECE #707070;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;}input[type="text"]:focus,input[type="password"]:focus{border-color:#A5C760;color:#333;-moz-box-shadow:0 0 3px #A5C760;-webkit-box-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760;outline:none ;}.alltxt{height:18px;line-height:18px;padding:3px 3px 2px 3px;vertical-align:middle;border-width:1px;border-style:solid;border-color:#707070 #CECECE #CECECE #707070;}textarea{background:url(../images/input.png) #fff repeat-x scroll 0px 0px;border-width:1px;border-style:solid;border-color:#707070 #CECECE #CECECE #707070;padding:2px 4px;vertical-align:middle;line-height:16px;overflow:auto;}textarea:focus{border-color:#A5C760;color:#333;-moz-box-shadow:0 0 3px #A5C760;-webkit-box-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760;}h1{color:#171B16;font-size:130%;font-weight:bold;}h2{color:#171B16;font-size:115%;font-weight:bold;}h3{color:#171B16;font-size:100%;font-weight:bold;}a:link{font-size:9pt;color:#000000;text-decoration:none;font-family:""宋体"";}a:visited{font-size:9pt;color:#000000;text-decoration:none;font-family:""宋体"";}a:hover{color:red;font-family:""宋体"";}a img{border-style:none;}b a{color:#666600;}strong a{color:#666600;}a b{color:#666600;}a strong{color:#666600;}.pubinputs{height:16px;line-height:16px;width:250px;padding:4px 0px 2px 0px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999;}.iptxt{height:14px;line-height:14px;padding:4px 3px 2px 3px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999;}.pubinput{height:24px;width:250px;padding-top:3px;padding-bottom:0px;}.pubinputl{height:24px;width:350px;padding-top:3px;padding-bottom:0px;}.np{border:none;}.linerow{border-bottom:1px solid #ACACAC;}.coolbg{border:none;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;padding:2px;padding-right:5px;padding-left:5px;background:#CCC url(../images/allbtbg2.gif);cursor:pointer;}.coolbg2{border:1px solid #000000;background-color:#DFDDD2;height:18px}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}.bline{border-bottom:1px dotted #BCBCBC;height:28px;background-color:#FFFFFF;}#uploadfield{float:left;}.bline2{border-bottom:1px solid #BCBCBC;}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background-color:#E4F7D7;cursor:pointer;}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background-color:#F7FCDA}.coolbg3{border:1px solid #BDC5B4;background-color:#DFDDD2;height:20px;width:140px;text-align:right;}.coolbg61{line-height:26px;width:380px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;height:26px;text-align:right;background-color:#E7F3B1;}.coolbg62{border:1px solid #BDC5B4;background-color:#F8FDF0;height:300px;width:380px;padding:5px;}.coolbg4{border-bottom:1px solid #C9CFC1;background-color:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;height:24px;line-height:24px;width:190px;text-align:right;}.coolbg5{border-top:1px solid #BDC5B4;background-color:#F9FCDC;font-size:1pt;height:6px;width:190px;}.wsselect{height:60px;line-height:24px
-	overflow-y:auto;overflow:auto;background-color:#FCFEF1;scrollbar-face-color:#ffffff;scrollbar-highlight-color:#919192;scrollbar-shadow-color:#919192;scrollbar-3dlight-color:#ffffff;scrollbar-arrow-color:#919192;scrollbar-track-color:#ffffff;scrollbar-darkshadow-color:#ffffff;}.dlg{border:2px solid #749F4D;background-color:#F0FAEB;padding:2px;width:360px;line-height:160%;}.pubdlg{z-index:8888;border:5px solid #749F4D;background-color:#fff;}.pubdlg .title{border-bottom:1px solid #C9CFC1;background-color:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;height:28px;line-height:28px;text-align:left;cursor:move;}.pubdlg .titLeft{float:left;padding-left:8px;line-height:28px;font-weight:bold;color:#555;}.pubdlg .titRight{float:right;padding:0px;}.fullpagediv{z-index:1999;top:0;left:0;background:#cdcdcd;filter:Alpha(opacity=50);-moz-opacity:.5;opacity:0.5;position:absolute;width:100%;height:2500px;}.quicksel{z-index:10005;width:680px;height:420px;margin-left:5px;margin-top:5px;overflow:auto;scrollbar-face-color:#ffffff;scrollbar-highlight-color:#919192;scrollbar-shadow-color:#919192;scrollbar-3dlight-color:#ffffff;scrollbar-arrow-color:#919192;scrollbar-track-color:#ffffff;scrollbar-darkshadow-color:#ffffff;}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D;}.quickselItem{margin-bottom:8px;}.quickselItem .topcat{font-weight:bold;clear:both;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;padding-left:5px;}.quickselItem .soncat{padding-left:10px;}.quickselItem .item{float:left;margin-right:8px;}.mysource,.mywriter{z-index:10001;border:5px solid #749F4D;background-color:#F0FAEB;padding:2px;width:280px;line-height:160%;}.dlgws div{width:100%;}.dlgTesttitle{border:2px solid #749F4D;background-color:#F0FAEB;padding:2px;width:300px;line-height:150%;}#_mysource{z-index:10003;}#_mywriter{z-index:10004;}#uploadwait{z-index:19999;}.option1{background-color:#DCECA6;}.option2{background-color:#F7FBD2;}.option3{background-color:#FFFFFF;}.ininput{width:96%;height:20px;border:1px solid #ffffff;}.nbt{padding:1px;background-image:url('../images/allbtbg.gif');background-color:#ffffff;border:1px solid #A5AF83;}.tdt{padding-left:6px;}.waitpage{top:0;left:0;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;background:url(../../images/loading1.gif) #ababab center no-repeat;}.divpre img{max-width:150px;max-height:100px;}.divpre{overflow:hidden;}.autoinput{padding-left:3px;width:90%;}.bodytitle{margin:auto;height:28px;border:1px dotted #BFD67C;background:url('../images/wbg.gif');margin-bottom:6px;width:98%;font-weight:bold;}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px;}.tbtitle td{padding:3px;}.tblist td{background:#FFFFFF;padding:6px;}.tblist td.tbsname{background:#F9FFE6;padding:6px;}.colordlg{width:100px;z-index;10005;border:2px dashed #749F4D;background-color:#F0FAEB;padding:2px;line-height:160%;}option.alltype{height:18px;line-height:18px;font-size:12px;padding-left:16px;background:url(../images/arr4.gif) 3px 4px no-repeat;}option.btype{height:18px;line-height:18px;font-size:12px;padding-left:16px;background:url(../images/arr4.gif) 3px 4px no-repeat;}option.stype{height:18px;line-height:18px;font-size:12px;padding-left:24px;background:url(../images/arrr.gif) 11px 4px no-repeat;}.ilist{border-top:1px dashed #BCBCBC;border-bottom:1px dashed #BCBCBC;border-left:1px dashed #BCBCBC;}.ilist td{border-right:1px dashed #BCBCBC;}#typeid2{border:0px;padding:0px;background:#ccc;height:18px;font-size:12px;padding-left:10px;background:url(../images/typeid2bg.gif) no-repeat;float:left;}.litpic_span{width:77px;overflow:hidden;height:21px;*vertical-align:3px;margin-left:-60px;*margin-left:-75px;cursor:pointer;}#litpic{width:85px;height:20px;margin-left:-20px;filter:alpha(opacity=00);-moz-opacity:.0;opacity:0.0;cursor:pointer;}#starttime,#endtime,#pubdate{background:url(../images/calendar.gif) 3px no-repeat;padding-left:23px;}#title{background:url(../images/ruler.gif) repeat-x 0px 5px;}.spec{width:60px;}.gtab a{width:80px;text-align:center;display:block;float:left;height:26px;line-height:26px;}
+* {
+	font-size: 12px;
+	font-family: "宋体";
+}
+
+td {
+	line-height: 1.5;
+}
+
+body {
+	font-size: 12px;
+	line-height: 1.5;
+	font-family: "宋体";
+	background-color: #FFF;
+}
+
+form,h1,h2,h3,ul,ol,div {
+	margin: 0;
+	padding: 0;
+}
+
+td,th,div {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+
+b,strong {
+	color: #666600;
+}
+
+li,dd {
+	list-style-type: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+input {
+	border: 1px solid #ababab;
+	zoom: expression(function(ele){(ele.type=='button'||ele.type=='submit'||ele.type=='reset') ?	ele.className='coolbg':(ele.type=='text' ?	ele.className='alltxt':'');
+	(ele.type=='radio'||ele.type=='checkbox') ?	ele.className='np': '';
+	ele.style.zoom = '1';
+}(this));
+}
+
+input {
+background: url(../images/input.png) repeat-x scroll 0px 0px;
+}
+
+select {
+padding: 3px;
+}
+
+input[type="button"],input[type="submit"],input[type="reset"] {
+border: none;
+border-right: 1px solid #ACACAC;
+border-bottom: 1px solid #ACACAC;
+background-color: #F1F8B4;
+padding: 2px;
+padding-right: 5px;
+padding-left: 5px;
+background: url(../images/allbtbg2.gif) #EFF7D0;
+cursor: pointer;
+}
+
+input[type="text"],input[type="password"] {
+border-width: 1px;
+border-style: solid;
+border-color: #707070 #CECECE #CECECE #707070;
+padding: 2px 4px;
+height: 18px;
+line-height: 18px;
+vertical-align: middle;
+}
+
+input[type="text"]:focus,input[type="password"]:focus {
+border-color: #A5C760;
+color: #333;
+-moz-box-shadow: 0 0 3px #A5C760;
+-webkit-box-shadow: 0 0 3px #A5C760;
+box-shadow: 0 0 3px #A5C760;
+outline: none;
+}
+
+.alltxt {
+height: 18px;
+line-height: 18px;
+padding: 3px 3px 2px 3px;
+vertical-align: middle;
+border-width: 1px;
+border-style: solid;
+border-color: #707070 #CECECE #CECECE #707070;
+}
+
+textarea {
+background: url(../images/input.png) #fff repeat-x scroll 0px 0px;
+border-width: 1px;
+border-style: solid;
+border-color: #707070 #CECECE #CECECE #707070;
+padding: 2px 4px;
+vertical-align: middle;
+line-height: 16px;
+overflow: auto;
+}
+
+textarea:focus {
+border-color: #A5C760;
+color: #333;
+-moz-box-shadow: 0 0 3px #A5C760;
+-webkit-box-shadow: 0 0 3px #A5C760;
+box-shadow: 0 0 3px #A5C760;
+}
+
+h1 {
+color: #171B16;
+font-size: 130%;
+font-weight: bold;
+}
+
+h2 {
+color: #171B16;
+font-size: 115%;
+font-weight: bold;
+}
+
+h3 {
+color: #171B16;
+font-size: 100%;
+font-weight: bold;
+}
+
+a:link {
+font-size: 9pt;
+color: #000000;
+text-decoration: none;
+font-family: ""宋体"";
+}
+
+a:visited {
+font-size: 9pt;
+color: #000000;
+text-decoration: none;
+font-family: ""宋体"";
+}
+
+a:hover {
+color: red;
+font-family: ""宋体"";
+}
+
+a img {
+border-style: none;
+}
+
+b a {
+color: #666600;
+}
+
+strong a {
+color: #666600;
+}
+
+a b {
+color: #666600;
+}
+
+a strong {
+color: #666600;
+}
+
+.pubinputs {
+height: 16px;
+line-height: 16px;
+width: 250px;
+padding: 4px 0px 2px 0px;
+border-width: 1px;
+border-style: solid;
+border-color: #999999 #dddddd #dddddd #999999;
+}
+
+.iptxt {
+height: 14px;
+line-height: 14px;
+padding: 4px 3px 2px 3px;
+border-width: 1px;
+border-style: solid;
+border-color: #999999 #dddddd #dddddd #999999;
+}
+
+.pubinput {
+height: 24px;
+width: 250px;
+padding-top: 3px;
+padding-bottom: 0px;
+}
+
+.pubinputl {
+height: 24px;
+width: 350px;
+padding-top: 3px;
+padding-bottom: 0px;
+}
+
+.np {
+border: none;
+}
+
+.linerow {
+border-bottom: 1px solid #ACACAC;
+}
+
+.coolbg {
+border: none;
+border-right: 1px solid #ACACAC;
+border-bottom: 1px solid #ACACAC;
+padding: 2px;
+padding-right: 5px;
+padding-left: 5px;
+background: #CCC url(../images/allbtbg2.gif);
+cursor: pointer;
+}
+
+.coolbg2 {
+border: 1px solid #000000;
+background-color: #DFDDD2;
+height: 18px
+}
+
+.ll {
+border-right: 2px solid #ACACAC;
+border-bottom: 2px solid #ACACAC;
+background-color: #E6E6E6
+}
+
+.bline {
+border-bottom: 1px dotted #BCBCBC;
+height: 28px;
+background-color: #FFFFFF;
+}
+
+#uploadfield {
+float: left;
+}
+
+.bline2 {
+border-bottom: 1px solid #BCBCBC;
+}
+
+.coolbt {
+border-left: 1px solid #EFEFEF;
+border-top: 1px solid #EFEFEF;
+border-right: 1px solid #ACACAC;
+border-bottom: 1px solid #ACACAC;
+background-color: #E4F7D7;
+cursor: pointer;
+}
+
+.coolbt2 {
+border-left: 1px solid #EFEFEF;
+border-top: 1px solid #EFEFEF;
+border-right: 1px solid #ACACAC;
+border-bottom: 1px solid #ACACAC;
+background-color: #F7FCDA
+}
+
+.coolbg3 {
+border: 1px solid #BDC5B4;
+background-color: #DFDDD2;
+height: 20px;
+width: 140px;
+text-align: right;
+}
+
+.coolbg61 {
+line-height: 26px;
+width: 380px;
+border-top: 1px solid #BDC5B4;
+border-left: 1px solid #BDC5B4;
+border-right: 1px solid #BDC5B4;
+height: 26px;
+text-align: right;
+background-color: #E7F3B1;
+}
+
+.coolbg62 {
+border: 1px solid #BDC5B4;
+background-color: #F8FDF0;
+height: 300px;
+width: 380px;
+padding: 5px;
+}
+
+.coolbg4 {
+border-bottom: 1px solid #C9CFC1;
+background-color: #F9FCDC;
+background: url(../images/dlgtitle.gif) repeat-x;
+height: 24px;
+line-height: 24px;
+width: 190px;
+text-align: right;
+}
+
+.coolbg5 {
+border-top: 1px solid #BDC5B4;
+background-color: #F9FCDC;
+font-size: 1pt;
+height: 6px;
+width: 190px;
+}
+
+.wsselect {
+height: 60px;
+line-height: 24px
+	overflow-y:auto;
+overflow: auto;
+background-color: #FCFEF1;
+scrollbar-face-color: #ffffff;
+scrollbar-highlight-color: #919192;
+scrollbar-shadow-color: #919192;
+scrollbar-3dlight-color: #ffffff;
+scrollbar-arrow-color: #919192;
+scrollbar-track-color: #ffffff;
+scrollbar-darkshadow-color: #ffffff;
+}
+
+.dlg {
+border: 2px solid #749F4D;
+background-color: #F0FAEB;
+padding: 2px;
+width: 360px;
+line-height: 160%;
+}
+
+.pubdlg {
+z-index: 8888;
+border: 5px solid #749F4D;
+background-color: #fff;
+}
+
+.pubdlg .title {
+border-bottom: 1px solid #C9CFC1;
+background-color: #F9FCDC;
+background: url(../images/dlgtitle.gif) repeat-x;
+height: 28px;
+line-height: 28px;
+text-align: left;
+cursor: move;
+}
+
+.pubdlg .titLeft {
+float: left;
+padding-left: 8px;
+line-height: 28px;
+font-weight: bold;
+color: #555;
+}
+
+.pubdlg .titRight {
+float: right;
+padding: 0px;
+}
+
+.fullpagediv {
+z-index: 1999;
+top: 0;
+left: 0;
+background: #cdcdcd;
+filter: Alpha(opacity=50);
+-moz-opacity: .5;
+opacity: 0.5;
+position: absolute;
+width: 100%;
+height: 2500px;
+}
+
+.quicksel {
+z-index: 10005;
+width: 680px;
+height: 420px;
+margin-left: 5px;
+margin-top: 5px;
+overflow: auto;
+scrollbar-face-color: #ffffff;
+scrollbar-highlight-color: #919192;
+scrollbar-shadow-color: #919192;
+scrollbar-3dlight-color: #ffffff;
+scrollbar-arrow-color: #919192;
+scrollbar-track-color: #ffffff;
+scrollbar-darkshadow-color: #ffffff;
+}
+
+.quickselfoot {
+padding-top: 8px;
+border-top: 1px dashed #C0CC9D;
+}
+
+.quickselItem {
+margin-bottom: 8px;
+}
+
+.quickselItem .topcat {
+font-weight: bold;
+clear: both;
+line-height: 24px;
+border-bottom: 1px dashed #ccc;
+background: #FBFEEF;
+padding-left: 5px;
+}
+
+.quickselItem .soncat {
+padding-left: 10px;
+}
+
+.quickselItem .item {
+float: left;
+margin-right: 8px;
+}
+
+.mysource,.mywriter {
+z-index: 10001;
+border: 5px solid #749F4D;
+background-color: #F0FAEB;
+padding: 2px;
+width: 280px;
+line-height: 160%;
+}
+
+.dlgws div {
+width: 100%;
+}
+
+.dlgTesttitle {
+border: 2px solid #749F4D;
+background-color: #F0FAEB;
+padding: 2px;
+width: 300px;
+line-height: 150%;
+}
+
+#_mysource {
+z-index: 10003;
+}
+
+#_mywriter {
+z-index: 10004;
+}
+
+#uploadwait {
+z-index: 19999;
+}
+
+.option1 {
+background-color: #DCECA6;
+}
+
+.option2 {
+background-color: #F7FBD2;
+}
+
+.option3 {
+background-color: #FFFFFF;
+}
+
+.ininput {
+width: 96%;
+height: 20px;
+border: 1px solid #ffffff;
+}
+
+.nbt {
+padding: 1px;
+background-image: url('../images/allbtbg.gif');
+background-color: #ffffff;
+border: 1px solid #A5AF83;
+}
+
+.tdt {
+padding-left: 6px;
+}
+
+.waitpage {
+top: 0;
+left: 0;
+filter: Alpha(opacity=70);
+-moz-opacity: 0.7;
+position: absolute;
+z-index: 10000;
+background: url(../../images/loading1.gif) #ababab center no-repeat;
+}
+
+.divpre img {
+max-width: 150px;
+max-height: 100px;
+}
+
+.divpre {
+overflow: hidden;
+}
+
+.autoinput {
+padding-left: 3px;
+width: 90%;
+}
+
+.bodytitle {
+margin: auto;
+height: 28px;
+border: 1px dotted #BFD67C;
+background: url('../images/wbg.gif');
+margin-bottom: 6px;
+width: 98%;
+font-weight: bold;
+}
+
+.bodytitle div {
+float: left
+}
+
+.bodytitletxt {
+padding-left: 6px;
+line-height: 28px;
+}
+
+.tbtitle td {
+padding: 3px;
+}
+
+.tblist td {
+background: #FFFFFF;
+padding: 6px;
+}
+
+.tblist td.tbsname {
+background: #F9FFE6;
+padding: 6px;
+}
+
+.colordlg {
+width: 100px;
+z-index;10005;border: 2px dashed #749F4D;
+background-color: #F0FAEB;
+padding: 2px;
+line-height: 160%;
+}
+
+option.alltype {
+height: 18px;
+line-height: 18px;
+font-size: 12px;
+padding-left: 16px;
+background: url(../images/arr4.gif) 3px 4px no-repeat;
+}
+
+option.btype {
+height: 18px;
+line-height: 18px;
+font-size: 12px;
+padding-left: 16px;
+background: url(../images/arr4.gif) 3px 4px no-repeat;
+}
+
+option.stype {
+height: 18px;
+line-height: 18px;
+font-size: 12px;
+padding-left: 24px;
+background: url(../images/arrr.gif) 11px 4px no-repeat;
+}
+
+.ilist {
+border-top: 1px dashed #BCBCBC;
+border-bottom: 1px dashed #BCBCBC;
+border-left: 1px dashed #BCBCBC;
+}
+
+.ilist td {
+border-right: 1px dashed #BCBCBC;
+}
+
+#typeid2 {
+border: 0px;
+padding: 0px;
+background: #ccc;
+height: 18px;
+font-size: 12px;
+padding-left: 10px;
+background: url(../images/typeid2bg.gif) no-repeat;
+float: left;
+}
+
+.litpic_span {
+width: 77px;
+overflow: hidden;
+height: 21px;
+*vertical-align: 3px;
+margin-left: -60px;
+*margin-left: -75px;
+cursor: pointer;
+}
+
+#litpic {
+width: 85px;
+height: 20px;
+margin-left: -20px;
+filter: alpha(opacity=00);
+-moz-opacity: .0;
+opacity: 0.0;
+cursor: pointer;
+}
+
+#starttime,#endtime,#pubdate {
+background: url(../images/calendar.gif) 3px no-repeat;
+padding-left: 23px;
+}
+
+#title {
+background: url(../images/ruler.gif) repeat-x 0px 5px;
+}
+
+.spec {
+width: 60px;
+}
+
+.gtab a {
+width: 80px;
+text-align: center;
+display: block;
+float: left;
+height: 26px;
+line-height: 26px;
+}
+
+.albCt img {
+cursor: pointer;
+}
+
+img {
+vertical-align: baseline;
+}
+
+input,
+	  select {
+height: auto !important;
+}

src/dede/js/calendar/calendar-green.css

@@ -1,239 +0,0 @@
-/* The main calendar widget.  DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
-  border: 1px solid #CDE4B3;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #F9FCF1;
-  font-family: tahoma,verdana,sans-serif;
-}
-
-.calendar table{border: 1px solid #fff;}
-/* Header part -- contains navigation buttons and day names. */
-.calendar table thead td{background:#E7F6D5; color:#97C069; border-bottom:1px solid #fff; border-right:none; height:16px; width:18px}
-.calendar table thead tr.headrow td{ background:#EDF9E0}
-.headrow{border-top:1px solid #CDE4B3}
-
-.calendar table thead td.button div div{
-	background-image: url(../../images/question-balloon.png);
-	background-repeat: no-repeat; text-indent:-100px; overflow:hidden
-}
-.headrow .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;    /* They are the navigation buttons */
-  border-right:1px solid #FFF; padding:0
-}
-.headrow .button div,.calendar table .wn div{border-right:1px solid #CDE4B3; height:23px; line-height:23px}
-.calendar .nav {
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;      /* Pressing it will take you to the current date */
-  text-align: center;
-  padding: 2px;
-  color:#6b9936; width:auto
-}
-
-.calendar thead tr { /* Row <TR> containing navigation buttons */
-  background: #007ED1;
-  color: #fff;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-  background: #EDF9E0;
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #CDE4B3;
-  padding: 2px;
-  text-align: center;
-  color: #000;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-  color: #a66;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background-color: #E7F6D5;
-  color: #6b9936;
-
-}
-
-
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  width: 2em;
-  color: #456;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day div{ padding-right:5px}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #bbb;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #fbb;
-}
-
-.calendar table .wn {
-  border-right: 1px solid #fff;
-  background: #EDF9E0; padding:0
-}
-
-.calendar tbody .rowhilite td {
-  background: #def;
-}
-
-.calendar tbody .rowhilite td.wn {
-  background: #F9FCF1;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: #93b9e2;
-  padding: 1px 3px 1px 1px;
-  color:#fff
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-  background: #cde;
-  padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.selected { /* Cell showing today date */
-  font-weight: bold;
-  padding: 1px 3px 1px 1px;
-  background: #ff7200;
-  color: #fff;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-  color: #a66;
-}
-
-.calendar tbody td.today { /* Cell showing selected date */
-  font-weight: bold;
-  color: #D50000;
-}
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-  text-align: center;
-  background: #206A9B;
-  color: #fff;
-}
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  background: #EDF9E0;
-  color: #6b9936;
-  border-top: 1px solid #CDE4B3;
-  padding: 1px; height:24px
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  background: #B8DAF0;
-  border: 1px solid #178AEB;
-  color: #000;
-  padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  background: #006AA9;
-  padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  top: 0px;
-  left: 0px;
-  width: 4em;
-  cursor: default;
-  border: 1px solid #655;
-  background: #def;
-  color: #000;
-  font-size: 90%;
-  z-index: 9999999999999999999999999999;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .hilite {
-  background: #34ABFA;
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  font-weight: bold;
-}
-
-.calendar .combo .active {
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  background: #F9FCF1;
-  font-weight: bold;
-}
-
-.calendar td.time {
-  border-top: 1px solid #CDE4B3;
-  padding: 1px 0px;
-  text-align: center;
-  background-color: #EDF2E3;
-  height:24px
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 3px 0px 4px;
-  border: 1px solid #889;
-  font-weight: bold;
-  background-color: #F9FCF1;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  border-color: #000;
-  background-color: #267DB7;
-  color: #fff;
-}
-
-.calendar td.time span.active {
-  border-color: red;
-  background-color: #000;
-  color: #A5FF00;
-}
-.calendar thead .active div{ /* Active (pressed) buttons in header */
-  background: #bdd2e8;
-}

src/dede/js/main.js

@@ -603,10 +603,10 @@ function getElementTop(element) {
 
 // 生成一个随机ID
 function guid() {
-    function S4() {
-        return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-    }
-    return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+	function S4() {
+		return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+	}
+	return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
 }
 
 // 显示对话框，动态创建modal并显示，退出自动销毁窗体
@@ -622,57 +622,57 @@ args = {
 // 这里用到了一个展开语法
 // https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
-    title = "DedeCMS";
-    if (typeof content == "undefined") content = "";
-    modalID = guid();
-    var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">Ok</button>`;
-    var noClose = false;
-
-    if (args.length == 1) {
-        // 存在args参数
-        if (typeof args[0].title !== 'undefined' && args[0].title != "") {
-            title = args[0].title;
-        }
-        if (typeof args[0].footer !== 'undefined' && args[0].footer != "") {
-            footer = args[0].footer;
-        }
-        if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) {
-            noClose = true;
-        }
-    }
-
-    footer = footer.replace("~modalID~", modalID);
-    content = content.replace("~modalID~", modalID);
-
-    var modal = `<div id="GKModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="GKModalLabel${modalID}" aria-hidden="true">
+	title = "DedeCMS";
+	if (typeof content == "undefined") content = "";
+	modalID = guid();
+	var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">Ok</button>`;
+	var noClose = false;
+
+	if (args.length == 1) {
+		// 存在args参数
+		if (typeof args[0].title !== 'undefined' && args[0].title != "") {
+			title = args[0].title;
+		}
+		if (typeof args[0].footer !== 'undefined' && args[0].footer != "") {
+			footer = args[0].footer;
+		}
+		if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) {
+			noClose = true;
+		}
+	}
+
+	footer = footer.replace("~modalID~", modalID);
+	content = content.replace("~modalID~", modalID);
+
+	var modal = `<div id="GKModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="GKModalLabel${modalID}" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content"><div class="modal-header">
 <h5 class="modal-title" id="GKModalLabel${modalID}">${title}</h5>`;
-    if (!noClose) {
-        modal += `<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+	if (!noClose) {
+		modal += `<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 		<span aria-hidden="true">&times;</span>
 		</button>`;
-    }
-    modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
-    $("body").append(modal)
-    $("#GKModal" + modalID).modal({
-        backdrop: 'static',
-        show: true
-    });
-    $("#GKModal" + modalID).on('hidden.bs.modal', function (e) {
-        $("#GKModal" + modalID).remove();
-    })
-    return modalID;
+	}
+	modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
+	$("body").append(modal)
+	$("#GKModal" + modalID).modal({
+		backdrop: 'static',
+		show: true
+	});
+	$("#GKModal" + modalID).on('hidden.bs.modal', function (e) {
+		$("#GKModal" + modalID).remove();
+	})
+	return modalID;
 }
 
 // 隐藏并销毁modal
 function CloseModal(modalID) {
-    $("#" + modalID).modal('hide');
-    $("#" + modalID).on('hidden.bs.modal', function (e) {
-        if ($("#" + modalID).length > 0) {
-            $("#" + modalID).remove();
-        }
-    })
+	$("#" + modalID).modal('hide');
+	$("#" + modalID).on('hidden.bs.modal', function (e) {
+		if ($("#" + modalID).length > 0) {
+			$("#" + modalID).remove();
+		}
+	})
 }
 
 // 获取缩略图
@@ -682,84 +682,84 @@ var currentCID = 0;
 var mdlCropperID = "";
 var pubAt = 0;
 var optCropper = {
-  preview: ".pv",
-  crop: function (e) {
-	$("#cropWidth").text(Math.round(e.detail.height));
-	$("#cropHeight").text(Math.round(e.detail.width));
-	var dataUrl = $(this).cropper("getCroppedCanvas")
-	  .toDataURL();
-	litpicImg = dataUrl;
-	$("#litPic").attr("src", litpicImg);
-	$("#litpic_b64").val(litpicImg);
-  },
-  aspectRatio: 4 / 3,
-  // 拖动截取缩略图后，截取的缩略图更新到imageItems中
-  cropend: function (data) {
-	// 这里的ID要单独取出来
-	var dataUrl = $(this).cropper("getCroppedCanvas")
-	  .toDataURL();
-	litpicImg = dataUrl;
-	$("#litPic").attr("src", litpicImg);
-	$("#litpic_b64").val(litpicImg);
-  }
+	preview: ".pv",
+	crop: function (e) {
+		$("#cropWidth").text(Math.round(e.detail.height));
+		$("#cropHeight").text(Math.round(e.detail.width));
+		var dataUrl = $(this).cropper("getCroppedCanvas")
+			.toDataURL();
+		litpicImg = dataUrl;
+		$("#litPic").attr("src", litpicImg);
+		$("#litpic_b64").val(litpicImg);
+	},
+	aspectRatio: 4 / 3,
+	// 拖动截取缩略图后，截取的缩略图更新到imageItems中
+	cropend: function (data) {
+		// 这里的ID要单独取出来
+		var dataUrl = $(this).cropper("getCroppedCanvas")
+			.toDataURL();
+		litpicImg = dataUrl;
+		$("#litPic").attr("src", litpicImg);
+		$("#litpic_b64").val(litpicImg);
+	}
 }
 
 var cropperAspectRatio = {
-  0: 16 / 9,
-  1: 4 / 3,
-  2: 1 / 1,
-  3: 2 / 3,
-  4: NaN,
+	0: 16 / 9,
+	1: 4 / 3,
+	2: 1 / 1,
+	3: 2 / 3,
+	4: NaN,
 }
 
 function setAspectRatio(ar) {
-  var opts = optCropper;
-  opts.aspectRatio = cropperAspectRatio[ar];
-  $("#cropImg" + mdlCropperID).cropper('destroy').cropper(opts);
+	var opts = optCropper;
+	opts.aspectRatio = cropperAspectRatio[ar];
+	$("#cropImg" + mdlCropperID).cropper('destroy').cropper(opts);
 }
 
 function useDefault(modalID) {
-  $("#litpic_b64").val(litpicImgSrc);
-  $("#litPic").attr("src", litpicImgSrc);
-  CloseModal('GKModal' + modalID);
+	$("#litpic_b64").val(litpicImgSrc);
+	$("#litPic").attr("src", litpicImgSrc);
+	CloseModal('GKModal' + modalID);
 }
 
 $(document).ready(function () {
 
-  $("#btnClearAll").click(function (event) {
-	litpicImgSrc = "";
-	litpicImg = "";
-	$("#litpic_b64").val(litpicImg);
-	$("#litPic").attr("src", "../static/defaultpic.gif");
-  })
-
-  // 添加图片
-  $("#iptAddImages").change(function (event) {
-	var files = event.target.files;
-	for (var i = 0, f; f = files[i]; i++) {
-	  // 如果不是图片忽略
-	  if (!f.type.match('image.*')) {
-		continue;
-	  }
-
-	  // 将图片渲染到浏览器
-	  var reader = new FileReader();
-	  reader.onload = (function (theFile) {
-		return function (e) {
-		  litpicImgSrc = e.target.result;
-		  SetThumb(litpicImgSrc);
-		};
-	  })(f);
-	  reader.readAsDataURL(f);
-	}
-	$("#iptAddImages").val("");
-  });
-
-  // 截取缩略图
-  function SetThumb(srcURL) {
-	var footer =
-	  "<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-outline-primary'>使用原图</a> <a href='?' class='btn btn-outline-primary' data-dismiss='modal' aria-label='Close'>确定</a></p>";
-	var optButton = `<p><div class="form-group">
+	$("#btnClearAll").click(function (event) {
+		litpicImgSrc = "";
+		litpicImg = "";
+		$("#litpic_b64").val(litpicImg);
+		$("#litPic").attr("src", "../static/defaultpic.gif");
+	})
+
+	// 添加图片
+	$("#iptAddImages").change(function (event) {
+		var files = event.target.files;
+		for (var i = 0, f; f = files[i]; i++) {
+			// 如果不是图片忽略
+			if (!f.type.match('image.*')) {
+				continue;
+			}
+
+			// 将图片渲染到浏览器
+			var reader = new FileReader();
+			reader.onload = (function (theFile) {
+				return function (e) {
+					litpicImgSrc = e.target.result;
+					SetThumb(litpicImgSrc);
+				};
+			})(f);
+			reader.readAsDataURL(f);
+		}
+		$("#iptAddImages").val("");
+	});
+
+	// 截取缩略图
+	function SetThumb(srcURL) {
+		var footer =
+			"<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-outline-primary'>使用原图</a> <a href='?' class='btn btn-outline-primary' data-dismiss='modal' aria-label='Close'>确定</a></p>";
+		var optButton = `<p><div class="form-group">
 			  <label for="aspectRatio">比例</label>
 			  <select class="form-control" id="aspectRatio" onchange="setAspectRatio(this.selectedIndex)">
 				<option>16:9</option>
@@ -769,17 +769,46 @@ $(document).ready(function () {
 				<option>自定义</option>
 			  </select>
 			</div></p>`;
-	mdlCropperID = ShowMsg(
-	  '<div><div class="float-left" style="width:300px;"><img id="cropImg~modalID~" src="' +
-	  srcURL +
-	  '" width=200><p>宽度：<span id="cropWidth"></span>px，高度：<span id="cropHeight"></span>px</p>' + optButton + '</div><div class="pv float-right" style="width:150px;height:100px;overflow:hidden;"></div></div>', {
-	  footer: footer,
-	  noClose: false,
-	  title: 'DedeCMS缩略图裁剪',
+		mdlCropperID = ShowMsg(
+			'<div><div class="float-left" style="width:300px;"><img id="cropImg~modalID~" src="' +
+			srcURL +
+			'" width=200><p>宽度：<span id="cropWidth"></span>px，高度：<span id="cropHeight"></span>px</p>' + optButton + '</div><div class="pv float-right" style="width:150px;height:100px;overflow:hidden;"></div></div>', {
+			footer: footer,
+			noClose: false,
+			title: 'DedeCMS缩略图裁剪',
+		});
+
+		setTimeout(function () {
+			$("#cropImg" + mdlCropperID).cropper(optCropper);
+		}, 500);
+	}
+
+	$('.datepicker').daterangepicker({
+		"singleDatePicker": true,
+		"autoApply": true,
+		"showDropdowns": true,
+		"linkedCalendars": false,
+		"timePicker": true,
+		"timePicker24Hour": true,
+		"timePickerSeconds": true,
+		"showCustomRangeLabel": false,
+		ranges: {
+			'今日': [moment(), moment()],
+			'昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+			'本月': [moment().startOf('month'), moment().startOf('month')],
+			'上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+		},
+		"locale": {
+			format: 'YYYY-MM-DD HH:mm:ss',
+			applyLabel: '确定',
+			cancelLabel: '取消',
+			daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+			monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+				'七月', '八月', '九月', '十月', '十一月', '十二月'],
+			firstDay: 1
+		}
+	}, function (start) {
+		$(this).val(start.format("YYYY-MM-DD HH:mm:ss"));
 	});
 
-	setTimeout(function () {
-	  $("#cropImg" + mdlCropperID).cropper(optCropper);
-	}, 500);
-  }
 })

src/dede/soft_add.php

@@ -112,6 +112,21 @@ else if($dopost=='save')
     //处理上传的缩略图
     if(empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);

src/dede/soft_edit.php

@@ -160,6 +160,21 @@ else if($dopost=='save')
         $ddisremote = 0;
     }
     $litpic = GetDDImage('litpic',$picname,$ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //分析处理附加表数据
     $inadd_f = '';

src/dede/spec_add.php

@@ -74,6 +74,21 @@ else if($dopost=='save')
     //处理上传的缩略图
     if(empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid);

src/dede/spec_edit.php

@@ -90,7 +90,22 @@ else if($dopost=='save')
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
 
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
+    
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';

src/dede/templets/ad_add.htm

@@ -1,78 +1,118 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>增加广告</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-<script language="javascript">
-function checkSubmit()
-{
-	if(document.form1.tagname.value=="")
-	{
-		alert("广告标识不能为空！");
-		document.form1.tagname.focus();
-		return false;
-	}
-}
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>增加广告</title>
+  <!-- <link rel="stylesheet" href="../static/css/bootstrap.min.css"> -->
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.tagname.value == "") {
+        alert("广告标识不能为空！");
+        document.form1.tagname.focus();
+        return false;
+      }
+    }
+
+    $(document).ready(function () {
+      $('.datepicker').daterangepicker({
+        "singleDatePicker": true,
+        "autoApply": true,
+        "showDropdowns": true,
+        "linkedCalendars": false,
+        "timePicker": true,
+        "timePicker24Hour": true,
+        // "timePickerSeconds": true,
+        "showCustomRangeLabel": false,
+        ranges: {
+          '今日': [moment(), moment()],
+          '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+          '本月': [moment().startOf('month'), moment().startOf('month')],
+          '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+        },
+        "locale": {
+          format: 'YYYY-MM-DD HH:mm',
+          applyLabel: '确定',
+          cancelLabel: '取消',
+          daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+          monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+            '七月', '八月', '九月', '十月', '十一月', '十二月'],
+          firstDay: 1
+        }
+      }, function (start) {
+        $(this).val(start.format("YYYY-MM-DD HH:mm"));
+      });
+
+    })
+  </script>
+  <style type="text/css">
+    .typetab {
+      text-align: left;
+    }
+
+    .typetab ul {
+      list-style: none;
+    }
+
+    .typetab ul li {
+      float: left;
+      margin: 5px 5px 0px;
+      height: 23px;
+      width: 64px;
+      background: url(images/adtype_link.gif) no-repeat scroll 0px 0px;
+      line-height: 23px;
+      text-align: center;
+      cursor: pointer;
+    }
+
+    .typetab ul .act {
+      background: url(images/adtype_act.gif) no-repeat scroll 0px 0px;
+    }
 
-</script>
-<style type="text/css">
-.typetab {
-	text-align: left;
-}
-.typetab ul {
-	list-style: none;
-}
-.typetab ul li {
-	float: left;
-	margin: 5px 5px 0px;
-	height: 23px;
-	width: 64px;
-	background: url(images/adtype_link.gif) no-repeat scroll 0px 0px;
-	line-height: 23px;
-	text-align: center;
-	cursor: pointer;
-}
-.typetab ul .act {
-	background: url(images/adtype_act.gif) no-repeat scroll 0px 0px;
-}
-.i_table {
-	border: 1px solid #CCC;
-}
-</style>
+    .i_table {
+      border: 1px solid #CCC;
+    }
+  </style>
 </head>
+
 <body background="images/allbg.gif" leftmargin='8' topmargin='8'>
-<form action="ad_add.php" method="post" name="form1" onSubmit="return checkSubmit()">
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
-  <tr>
-    <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b><a href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 增加广告位置 </td>
-  </tr>
-  <tr>
-    <td height="200" bgcolor="#FFFFFF" valign="top"><table width="100%" border="0" cellspacing="4" cellpadding="4">
- 
-          <input name="normbody[style]" type="hidden" value="code" id="adstyle"/>
-          <input type="hidden" name="token" value="<?php echo make_hash();?>" />
-          <input type='hidden' name='dopost' value='save'>
-          <tr>
-            <td height="25" colspan="3">广告代码的调用方法：{dede:myad name='广告位标识'/} </td>
-          </tr>
-          <tr>
-            <td height="25" align="center">广告位标识：</td>
-            <td colspan="2"><input name="tagname" type="text" id="tagname" class='iptxt' />
-              （使用英文或数字表示的简洁标识）</td>
-          </tr>
-          <tr>
-            <td height="25" align="center">广告分类：</td>
-            <td colspan="2"><select name='clsid' style='width:150' id="clsid">
-                <option value='0'>默认分类...</option>
-                <?php echo $option;?>
-              </select></td>
-          </tr>
-          <tr>
-            <td width="15%" height="25" align="center">广告投放范围：</td>
-            <td colspan="2"><?php
+  <form action="ad_add.php" method="post" name="form1" onSubmit="return checkSubmit()">
+    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+      <tr>
+        <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b><a
+              href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 增加广告位置 </td>
+      </tr>
+      <tr>
+        <td height="200" bgcolor="#FFFFFF" valign="top">
+          <table width="100%" border="0" cellspacing="4" cellpadding="4">
+
+            <input name="normbody[style]" type="hidden" value="code" id="adstyle" />
+            <input type="hidden" name="token" value="<?php echo make_hash();?>" />
+            <input type='hidden' name='dopost' value='save'>
+            <tr>
+              <td height="25" colspan="3">广告代码的调用方法：{dede:myad name='广告位标识'/} </td>
+            </tr>
+            <tr>
+              <td height="25" align="center">广告位标识：</td>
+              <td colspan="2"><input name="tagname" type="text" id="tagname" class='iptxt' />
+                （使用英文或数字表示的简洁标识）</td>
+            </tr>
+            <tr>
+              <td height="25" align="center">广告分类：</td>
+              <td colspan="2"><select name='clsid' style='width:150' id="clsid">
+                  <option value='0'>默认分类...</option>
+                  <?php echo $option;?>
+                </select></td>
+            </tr>
+            <tr>
+              <td width="15%" height="25" align="center">广告投放范围：</td>
+              <td colspan="2"><?php
 			$tl = new TypeLink(0);
 			$typeOptions = $tl->GetOptionArray(0,0,0);
 			echo "<select name='typeid' style='width:300px'>\r\n";
@@ -80,74 +120,64 @@ function checkSubmit()
 			echo $typeOptions;
 			echo "</select>";
 			?>
-              <br>
-              （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
-          </tr>
-          <tr>
-            <td height="25" align="center">广告位名称：</td>
-            <td colspan="2"><input name="adname" type="text" id="adname" size="30" class='iptxt' /></td>
-          </tr>
-          <tr>
-            <td height="25" align="center">时间限制：</td>
-            <td colspan="2"><input name="timeset" type="radio" class="np" value="0" checked='1' id="notimelimit" />
-              <label for="notimelimit">永不过期</label>
-              <input type="radio" name="timeset" class="np" value="1" id="timelimit"/>
-              <label for="timelimit">在设内时间内有效</label></td>
-          </tr>
-          <tr>
-            <td height="25" align="center">投放时间：</td>
-            <td colspan="2">从
-              <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class='iptxt'/>
-              <script language="javascript" type="text/javascript">
-						Calendar.setup({
-							inputField     :    "starttime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script> 
-              到
-              <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class='iptxt'/>
-              <script language="javascript" type="text/javascript">
-						Calendar.setup({
-							inputField     :    "endtime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script></td>
-          </tr>
-          <tr>
-            <td height="80" align="center">广告内容：</td>
-            <td width="76%"><div class="typetab">
-                <ul id="changeTab">
-                  <li id="t_code" class="act">代码</li>
-                  <li id="t_txt">文字</li>
-                  <li id="t_img">图片</li>
-                  <li id="t_flash">Flash</li>
-                </ul>
-                <div style="clear:both"></div>
-              </div>
-              <div id='advert'>
+                <br>
+                （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
+            </tr>
+            <tr>
+              <td height="25" align="center">广告位名称：</td>
+              <td colspan="2"><input name="adname" type="text" id="adname" size="30" class='iptxt' /></td>
+            </tr>
+            <tr>
+              <td height="25" align="center">时间限制：</td>
+              <td colspan="2"><input name="timeset" type="radio" class="np" value="0" checked='1' id="notimelimit" />
+                <label for="notimelimit">永不过期</label>
+                <input type="radio" name="timeset" class="np" value="1" id="timelimit" />
+                <label for="timelimit">在设内时间内有效</label></td>
+            </tr>
+            <tr>
+              <td height="25" align="center">投放时间：</td>
+              <td colspan="2">从
+                <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>"
+                  class='iptxt datepicker' />
+                到
+                <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class='iptxt datepicker' />
+              </td>
+            </tr>
+            <tr>
+              <td height="80" align="center">广告内容：</td>
+              <td width="76%">
+                <div class="typetab">
+                  <ul id="changeTab">
+                    <li id="t_code" class="act">代码</li>
+                    <li id="t_txt">文字</li>
+                    <li id="t_img">图片</li>
+                    <li id="t_flash">Flash</li>
+                  </ul>
+                  <div style="clear:both"></div>
+                </div>
+                <div id='advert'>
+
+                </div>
+              </td>
+              <td width="9%">&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="80" align="center">过期显示内容：</td>
+              <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100"></textarea></td>
+              <td>&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="53" align="center">&nbsp;</td>
+              <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22"
+                  border="0" class="np" /></td>
+            </tr>
 
-              </div></td>
-            <td width="9%">&nbsp;</td>
-          </tr>
-          <tr>
-            <td height="80" align="center">过期显示内容：</td>
-            <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100"></textarea></td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr>
-            <td height="53" align="center">&nbsp;</td>
-            <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" border="0" class="np" /></td>
-          </tr>
-        
-      </table></td>
-  </tr>
-</table>
-</form>
-<div style="display:none" id="formtxt">
+          </table>
+        </td>
+      </tr>
+    </table>
+  </form>
+  <div style="display:none" id="formtxt">
     <div class="content" id="code" style="display:none;">
       <table width="80%" cellpadding="3" cellspacing="1" class="i_table">
         <tr class="b">
@@ -161,19 +191,19 @@ function checkSubmit()
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
           <td class="b" width="30%"><b>文字内容*</b></td>
-          <td class="b"><input type="text" size="70" name="normbody[title]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="70" name="normbody[title]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>文字链接*</b></td>
-          <td class="b"><input type="text" size="70" name="normbody[link]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="70" name="normbody[link]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>文字颜色</b>(例如:red,#EF8684)</td>
-          <td class="b"><input type="text" size="10" name="normbody[color]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="10" name="normbody[color]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>文字大小</b>(例如:4px,12px)</td>
-          <td class="b"><input type="text" size="10" name="normbody[size]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="10" name="normbody[size]" value="" class='iptxt' /></td>
         </tr>
       </table>
     </div>
@@ -181,23 +211,23 @@ function checkSubmit()
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
           <td class="b" width="30%"><b>图片地址*</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[url]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[url]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>图片链接*</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>图片宽度</b></td>
-          <td class="b"><input type="text" size="10" name="normbody[width]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="10" name="normbody[width]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>图片高度</b></td>
-          <td class="b"><input type="text" size="10" name="normbody[height]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="10" name="normbody[height]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>图片描述</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[descrip]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[descrip]" value="" class='iptxt' /></td>
         </tr>
       </table>
     </div>
@@ -205,44 +235,42 @@ function checkSubmit()
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
           <td class="b" width="30%"><b>flash链接</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>flash宽度</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[width]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[width]" value="" class='iptxt' /></td>
         </tr>
         <tr>
           <td class="b"><b>flash高度</b></td>
-          <td class="b"><input type="text" size="40" name="normbody[height]" value="" class='iptxt'/></td>
+          <td class="b"><input type="text" size="40" name="normbody[height]" value="" class='iptxt' /></td>
         </tr>
       </table>
     </div>
-    
-</div>
-<script language="JavaScript">
-(function($){
-	function showcode(idName){
-		$("#advert").html("").html($("#formtxt>#"+idName).html());
-		$("#adstyle").val(idName);
-	}
-	
-	showcode('code');
 
-	$("#changeTab>li").click(function()
-	{
-		var tabLi = $(this);
-		var thistab = tabLi[0].id;
-		$(".content").each(function()
-		{
-			if("t_" + $(this)[0].id == thistab)
-			{ 
-			    $("#changeTab>li").removeClass("act");
-			    $("#t_" + $(this)[0].id).addClass("act");
-			    showcode($(this)[0].id);
-			}
-		})
-	})
-})(jQuery);
-</script>
+  </div>
+  <script language="JavaScript">
+      (function ($) {
+        function showcode(idName) {
+          $("#advert").html("").html($("#formtxt>#" + idName).html());
+          $("#adstyle").val(idName);
+        }
+
+        showcode('code');
+
+        $("#changeTab>li").click(function () {
+          var tabLi = $(this);
+          var thistab = tabLi[0].id;
+          $(".content").each(function () {
+            if ("t_" + $(this)[0].id == thistab) {
+              $("#changeTab>li").removeClass("act");
+              $("#t_" + $(this)[0].id).addClass("act");
+              showcode($(this)[0].id);
+            }
+          })
+        })
+      })(jQuery);
+  </script>
 </body>
+
 </html>

src/dede/templets/ad_edit.htm

@@ -1,38 +1,79 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>更改广告</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>更改广告</title>
+  <!-- <link rel="stylesheet" href="../static/css/bootstrap.min.css"> -->
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <script language="javascript">
+    $(document).ready(function () {
+      $('.datepicker').daterangepicker({
+        "singleDatePicker": true,
+        "autoApply": true,
+        "showDropdowns": true,
+        "linkedCalendars": false,
+        "timePicker": true,
+        "timePicker24Hour": true,
+        // "timePickerSeconds": true,
+        "showCustomRangeLabel": false,
+        ranges: {
+          '今日': [moment(), moment()],
+          '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+          '本月': [moment().startOf('month'), moment().startOf('month')],
+          '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+        },
+        "locale": {
+          format: 'YYYY-MM-DD HH:mm',
+          applyLabel: '确定',
+          cancelLabel: '取消',
+          daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+          monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+            '七月', '八月', '九月', '十月', '十一月', '十二月'],
+          firstDay: 1
+        }
+      }, function (start) {
+        $(this).val(start.format("YYYY-MM-DD HH:mm"));
+      });
+
+    })
+  </script>
 </head>
+
 <body background="images/allbg.gif" leftmargin='8' topmargin='8'>
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
-  <tr>
-    <td height="28" background="images/tbg.gif" style="padding-left:10px;">&nbsp;<b><a href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 更改广告 </td>
-  </tr>
-  <tr>
-    <td height="200" bgcolor="#FFFFFF" valign="top"><table width="100%" border="0" cellspacing="4" cellpadding="4">
-        <form action="ad_edit.php" method="post" enctype="multipart/form-data" name="form1">
-          <input type='hidden' name='aid' value='<?php echo $aid?>'>
-          <input type='hidden' name='dopost' value='saveedit'>
-          <input type="hidden" name="token" value="<?php echo make_hash();?>" />
-          <tr>
-            <td height="25" align="center">广告位标识：</td>
-            <td colspan="2"><?php echo $row['tagname']; ?></td>
-          </tr>
-          <tr>
-            <td height="25" align="center">广告分类：</td>
-            <td colspan="2"><select name='clsid' style='width:150' id="clsid">
-                <option value='0'>默认分类...</option>
-                
-          	<?php echo $option;?>
-          
-              </select></td>
-          </tr>
-          <tr>
-            <td width="15%" height="25" align="center">广告投放范围：</td>
-            <td colspan="2"><?php
+  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+    <tr>
+      <td height="28" background="images/tbg.gif" style="padding-left:10px;">&nbsp;<b><a
+            href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 更改广告 </td>
+    </tr>
+    <tr>
+      <td height="200" bgcolor="#FFFFFF" valign="top">
+        <table width="100%" border="0" cellspacing="4" cellpadding="4">
+          <form action="ad_edit.php" method="post" enctype="multipart/form-data" name="form1">
+            <input type='hidden' name='aid' value='<?php echo $aid?>'>
+            <input type='hidden' name='dopost' value='saveedit'>
+            <input type="hidden" name="token" value="<?php echo make_hash();?>" />
+            <tr>
+              <td height="25" align="center">广告位标识：</td>
+              <td colspan="2"><?php echo $row['tagname']; ?></td>
+            </tr>
+            <tr>
+              <td height="25" align="center">广告分类：</td>
+              <td colspan="2"><select name='clsid' style='width:150' id="clsid">
+                  <option value='0'>默认分类...</option>
+
+                  <?php echo $option;?>
+
+                </select></td>
+            </tr>
+            <tr>
+              <td width="15%" height="25" align="center">广告投放范围：</td>
+              <td colspan="2"><?php
            	$tl = new TypeLink(0);
            	$typeOptions = $tl->GetOptionArray($row['typeid'],0,0);
             echo "<select name='typeid' style='width:300px'>\r\n";
@@ -40,58 +81,55 @@
             echo $typeOptions;
             echo "</select>";
 			?>
-              <br>
-              （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目） </td>
-          </tr>
-          <tr>
-            <td height="25" align="center">广告位名称：</td>
-            <td colspan="2"><input name="adname" type="text" id="adname" size="30" value="<?php echo $row['adname']?>" class='iptxt' /></td>
-          </tr>
-          <tr>
-            <td height="25" align="center">时间限制：</td>
-            <td colspan="2"><input class="np" name="timeset" type="radio" value="0"<?php if($row['timeset']==0) echo " checked='1' "; ?> />
-              永不过期
-              <input class="np" type="radio" name="timeset" value="1" <?php if($row['timeset']==1) echo " checked='1' "; ?> />
-              在设内时间内有效</td>
-          </tr>
-          <tr>
-            <td height="25" align="center">投放时间：</td>
-            <td colspan="2">从
-              <input name="starttime" type="text" id="starttime" value="<?php echo GetDateTimeMk($row['starttime'])?>" class='iptxt' />
-              <script language="javascript" type="text/javascript">
-						Calendar.setup({
-							inputField     :    "starttime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script> 到 
-			  <input name="endtime" type="text" id="endtime" value="<?php echo GetDateTimeMk($row['endtime'])?>" class='iptxt' /><script language="javascript" type="text/javascript">
-						Calendar.setup({
-							inputField     :    "endtime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script></td>
-          </tr>
-          <tr>
-            <td height="80" align="center">正常显示内容：</td>
-            <td width="76%"><textarea name="normbody" rows="10" id="normbody" style="width:80%;height:100"><?php echo dede_htmlspecialchars(stripslashes($row['normbody']))?></textarea></td>
-            <td width="9%">&nbsp;</td>
-          </tr>
-          <tr>
-            <td height="80" align="center">过期显示内容：</td>
-            <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100"><?php echo dede_htmlspecialchars($row['expbody'])?></textarea></td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr>
-            <td height="53" align="center">&nbsp;</td>
-            <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" border="0"></td>
-          </tr>
-        </form>
-      </table></td>
-  </tr>
-</table>
+                <br>
+                （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目） </td>
+            </tr>
+            <tr>
+              <td height="25" align="center">广告位名称：</td>
+              <td colspan="2"><input name="adname" type="text" id="adname" size="30" value="<?php echo $row['adname']?>"
+                  class='iptxt' /></td>
+            </tr>
+            <tr>
+              <td height="25" align="center">时间限制：</td>
+              <td colspan="2"><input class="np" name="timeset" type="radio" value="0"
+                  <?php if($row['timeset']==0) echo " checked='1' "; ?> />
+                永不过期
+                <input class="np" type="radio" name="timeset" value="1"
+                  <?php if($row['timeset']==1) echo " checked='1' "; ?> />
+                在设内时间内有效</td>
+            </tr>
+            <tr>
+              <td height="25" align="center">投放时间：</td>
+              <td colspan="2">从
+                <input name="starttime" type="text" id="starttime" value="<?php echo GetDateTimeMk($row['starttime'])?>"
+                  class='iptxt datepicker' />
+                到
+                <input name="endtime" type="text" id="endtime" value="<?php echo GetDateTimeMk($row['endtime'])?>"
+                  class='iptxt datepicker' /></td>
+            </tr>
+            <tr>
+              <td height="80" align="center">正常显示内容：</td>
+              <td width="76%"><textarea name="normbody" rows="10" id="normbody"
+                  style="width:80%;height:100"><?php echo dede_htmlspecialchars(stripslashes($row['normbody']))?></textarea>
+              </td>
+              <td width="9%">&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="80" align="center">过期显示内容：</td>
+              <td><textarea name="expbody" rows="10" id="expbody"
+                  style="width:80%;height:100"><?php echo dede_htmlspecialchars($row['expbody'])?></textarea></td>
+              <td>&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="53" align="center">&nbsp;</td>
+              <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22"
+                  border="0"></td>
+            </tr>
+          </form>
+        </table>
+      </td>
+    </tr>
+  </table>
 </body>
+
 </html>

src/dede/templets/album_add.htm

@@ -11,7 +11,9 @@
   <link href="css/albumupload.css" rel="stylesheet" type="text/css" />
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script type="text/javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script type="text/javascript" src="js/main.js"></script>
   <script type="text/javascript" src="js/album.js"></script>
   <script type="text/javascript" src="js/handlers.js"></script>
@@ -501,16 +503,8 @@
               <td width="90">&nbsp;发布时间：</td>
               <td width="241"><?php
           $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120;\">";
+          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120;\" class='datepicker'>";
 			?>
-                <script language="javascript" type="text/javascript">
-                  Calendar.setup({
-                    inputField: "pubdate",
-                    ifFormat: "%Y-%m-%d %H:%M:%S",
-                    showsTime: true,
-                    timeFormat: "24"
-                  });
-                </script>
               </td>
               <td width="90">消费金币：</td>
               <td width="379"><input name="money" type="text" id="money" value="0" size="10"> </td>

src/dede/templets/album_edit.htm

@@ -14,7 +14,9 @@ body {
 <link href="css/albumupload.css" rel="stylesheet" type="text/css" />
 <script language="javascript" src="../static/js/jquery.js"></script>
 <script type="text/javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link href="../static/css/daterangepicker.css" rel="stylesheet">
+<script type="text/javascript" src="../static/js/moment.min.js"></script>
+<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
 <script type="text/javascript" src="js/main.js"></script>
 <script type="text/javascript" src="js/album.js"></script>
 <script type="text/javascript" src="js/handlers.js"></script>
@@ -306,33 +308,9 @@ if($cfg_need_typeid2=='Y') {
             <td width="90">&nbsp;发布时间：</td>
             <td width="250"><?php
 			$nowtime = GetDateTimeMk(time());
-			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
+			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\" class='datepicker'>";
 			?>
-               <script language="javascript" type="text/javascript">
-				    var showX = getElementLeft($Obj("pubdate")) - 130;
-					var showY = (window.navigator.userAgent.indexOf("MSIE") >=1 )? getElementTop($Obj("pubdate")) + 465 :  getElementTop($Obj("pubdate")) + 435;
-					if((window.navigator.userAgent.indexOf("MSIE 7.0") >=1 )) {
-						showX = getElementLeft($Obj("pubdate"))+105;
-						showY = getElementTop($Obj("pubdate"))+1000;
-					}
-					if(window.navigator.userAgent.indexOf("MSIE 6.0")>=1)
-					{
-						Calendar.setup({
-							inputField     :    "pubdate",
-							ifFormat       :    "%Y-%m-%d %H:%M:%S",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-					} else {
-						Calendar.setup({
-							inputField     :    "pubdate",
-							ifFormat       :    "%Y-%m-%d %H:%M:%S",
-							showsTime      :    true,
-							position       :    [showX, showY],
-							timeFormat     :    "24"
-						});
-					}
-				 </script> </td>
+             </td>
             <td width="92">消费金币：</td>
             <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>" size="10"></td>
           </tr>

src/dede/templets/archives_add.htm

@@ -16,7 +16,9 @@
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
   <script language='javascript' src="js/main.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
   <link href="../static/css/cropper.min.css" rel="stylesheet">
@@ -372,7 +374,7 @@
               <td width="90">&nbsp;发布时间：</td>
               <td width="241"><?php
 			$nowtime = GetDateTimeMk(time());
-			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
+			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker' style=\"width:200\">";
 			?> </td>
               <td width="90">消费金币：</td>
               <td width="379"><input name="money" type="text" id="money" value="0" size="10"> </td>

src/dede/templets/archives_edit.htm

@@ -25,7 +25,9 @@
   <script src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
   <script language="javascript" src="js/main.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
   <link href="../static/css/cropper.min.css" rel="stylesheet">

src/dede/templets/archives_sg_add.htm

@@ -12,7 +12,9 @@ body { background-image: url(images/allbg.gif); }
 <script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script language='javascript' src="js/main.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link href="../static/css/daterangepicker.css" rel="stylesheet">
+<script type="text/javascript" src="../static/js/moment.min.js"></script>
+<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
 <script src="../static/js/bootstrap.bundle.js"></script>
 <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
 <link href="../static/css/cropper.min.css" rel="stylesheet">

src/dede/templets/archives_sg_edit.htm

@@ -12,7 +12,9 @@ body { background-image: url(images/allbg.gif); }
 <script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script language="javascript" src="js/main.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link href="../static/css/daterangepicker.css" rel="stylesheet">
+<script type="text/javascript" src="../static/js/moment.min.js"></script>
+<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
 <script src="../static/js/bootstrap.bundle.js"></script>
 <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
 <link href="../static/css/cropper.min.css" rel="stylesheet">

src/dede/templets/article_add.htm

@@ -25,7 +25,9 @@
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script language='javascript' src="js/main.js"></script>
   <script type="text/javascript" src="js/handlers.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
@@ -464,33 +466,9 @@
               <td width="241">
                 <?php
           $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120px\">";
+          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120px\" class='datepicker'>";
 
 			     ?>
-                <script language="javascript" type="text/javascript">
-                  var showX = getElementLeft($Obj("pubdate")) - 130;
-                  var showY = (window.navigator.userAgent.indexOf("MSIE") >= 1) ? getElementTop($Obj("pubdate")) + 465 : getElementTop($Obj("pubdate")) + 435;
-                  if ((window.navigator.userAgent.indexOf("MSIE 7.0") >= 1)) {
-                    showX = getElementLeft($Obj("pubdate")) + 105;
-                    showY = getElementTop($Obj("pubdate")) + 1200;
-                  }
-                  if (window.navigator.userAgent.indexOf("MSIE 6.0") >= 1) {
-                    Calendar.setup({
-                      inputField: "pubdate",
-                      ifFormat: "%Y-%m-%d %H:%M:%S",
-                      showsTime: true,
-                      timeFormat: "24"
-                    });
-                  } else {
-                    Calendar.setup({
-                      inputField: "pubdate",
-                      ifFormat: "%Y-%m-%d %H:%M:%S",
-                      showsTime: true,
-                      position: [showX, showY],
-                      timeFormat: "24"
-                    });
-                  }
-                </script>
               </td>
               <td width="90">发布选项：</td>
               <td width="379"><input name="ishtml" type="radio" class="np" value="1" checked="1" />

src/dede/templets/article_edit.htm

@@ -15,7 +15,9 @@
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script language="javascript" src="js/main.js"></script>
   <script type="text/javascript" src="js/handlers.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
@@ -365,17 +367,9 @@ if($cfg_need_typeid2=='Y') {
             <tr>
               <td width="110">&nbsp;更新时间：</td>
               <td width="250"><?php
-          $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120px;\">";
-			?>
-                <script language="javascript" type="text/javascript">
-                  Calendar.setup({
-                    inputField: "pubdate",
-                    ifFormat: "%Y-%m-%d %H:%M:%S",
-                    showsTime: true,
-                    timeFormat: "24"
-                  });
-                </script>
+              $nowtime = GetDateTimeMk(time());
+              echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120px;\" class='datepicker'>";
+              ?>
               </td>
               <td width="92">消费金币：</td>
               <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>"

src/dede/templets/content_batch_up.htm

@@ -1,45 +1,81 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>文档批量管理</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language='javascript'>
-	function ShowHideTime()
-	{
-		var selBox = document.getElementById('seltime');
-		var obj = document.getElementById('seltimeField');
-		if(selBox.checked) obj.style.display = "block";
-		else  obj.style.display = "none";
-	}
-	function ShowHideMove()
-	{
-		var selBox = document.getElementById('moveradio');
-		var obj = document.getElementById('moveField');
-		if(selBox.checked) obj.style.display = "block";
-		else  obj.style.display = "none";
-	}
-</script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>文档批量管理</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <script language='javascript'>
+    function ShowHideTime() {
+      var selBox = document.getElementById('seltime');
+      var obj = document.getElementById('seltimeField');
+      if (selBox.checked) obj.style.display = "block";
+      else obj.style.display = "none";
+    }
+    function ShowHideMove() {
+      var selBox = document.getElementById('moveradio');
+      var obj = document.getElementById('moveField');
+      if (selBox.checked) obj.style.display = "block";
+      else obj.style.display = "none";
+    }
+
+    $(document).ready(function () {
+
+      $('.datepicker').daterangepicker({
+        "singleDatePicker": true,
+        "autoApply": true,
+        "showDropdowns": true,
+        "linkedCalendars": false,
+        "timePicker": true,
+        "timePicker24Hour": true,
+        "timePickerSeconds": true,
+        "showCustomRangeLabel": false,
+        ranges: {
+          '今日': [moment(), moment()],
+          '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+          '本月': [moment().startOf('month'), moment().startOf('month')],
+          '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+        },
+        "locale": {
+          format: 'YYYY-MM-DD HH:mm:ss',
+          applyLabel: '确定',
+          cancelLabel: '取消',
+          daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+          monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+            '七月', '八月', '九月', '十月', '十一月', '十二月'],
+          firstDay: 1
+        }
+      }, function (start) {
+        $(this).val(start.format("YYYY-MM-DD HH:mm:ss"));
+      });
+
+    })
+  </script>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" align="center">
-  <form name="form1" action="content_batchup_action.php" target="stafrm" method="post">
-    <input type="hidden" name="dopost" value="go">
-    <tr> 
-      <td height="28" colspan="2" background='images/tbg.gif'>
-      	<table width="98%" border="0" cellpadding="0" cellspacing="0">
-          <tr> 
-            <td width="177" height="18"  style="padding-left:10px;"><strong>文档批量管理：</strong></td>
-            <td align="right">&nbsp;</td>
-          </tr>
-        </table>
-       </td>
-    </tr>
-    <tr> 
-      <td width="177" align="center" bgcolor="#FFFFFF">选定栏目：</td>
-      <td bgcolor="#FFFFFF"> 
-     <?php
+  <table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" align="center">
+    <form name="form1" action="content_batchup_action.php" target="stafrm" method="post">
+      <input type="hidden" name="dopost" value="go">
+      <tr>
+        <td height="28" colspan="2" background='images/tbg.gif'>
+          <table width="98%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="177" height="18" style="padding-left:10px;"><strong>文档批量管理：</strong></td>
+              <td align="right">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="177" align="center" bgcolor="#FFFFFF">选定栏目：</td>
+        <td bgcolor="#FFFFFF">
+          <?php
        $tl = new TypeLink(0);
        $typeOptions = $tl->GetOptionArray(0,$admin_catalogs,0,1);
        echo "<select name='typeid' style='width:300'>\r\n";
@@ -47,76 +83,60 @@
        echo $typeOptions;
        echo "</select>";
 		?>
-      </td>
-    </tr>
-    <tr> 
-      <td height="20" align="center" bgcolor="#FFFFFF">起始ID：</td>
-      <td height="20" bgcolor="#FFFFFF">开始： 
-        <input name="startid" type="text" id="startid" size="10">
-        结束： 
-        <input name="endid" type="text" id="endid" size="10"></td>
-    </tr>
-    <tr> 
-      <td height="20" align="center" bgcolor="#FFFFFF">档案发布时间：</td>
-      <td height="20" bgcolor="#FFFFFF">
-      	<table width="500" border="0" cellspacing="0" cellpadding="0">
-          <tr> 
-            <td colspan="2"> <label> 
-              <input name="seltime" type="checkbox" class="np" id="seltime" value="1" onClick="ShowHideTime()">
-              启用时间筛选（仅移动或删除文档可用该选项）</label></td>
-          </tr>
-          <tr id='seltimeField' style='display:none' height='20'> 
-            <td width="250">开始： 
-              <?php $nowtime = GetDateTimeMk(time()-(24*3600*30)); ?>
-			        <input name="starttime" value="<?php echo $nowtime; ?>" type="text"
-			         id="starttime" style="width:120px" />
-                    <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "starttime",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script>
-            </td>
-            <td width="250">结束： 
-              <?php $nowtime = GetDateTimeMk(time()); ?>
-              <input name="endtime" value="<?php echo $nowtime; ?>" type="text"
-               id="endtime" style="width:120px"/>
-                    <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "endtime",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script>
-            </td>
-          </tr>
-        </table>
         </td>
-    </tr>
-    <tr>
-      <td height="20" align="center" bgcolor="#FFFFFF">用户的登录id：</td>
-      <td height="20" bgcolor="#FFFFFF"><input name="userid" type="text" id="userid" size="20" />
-      (网址uid=后面跟的id)</td>
-    </tr>
-    <tr> 
-      <td height="20" align="center" bgcolor="#FFFFFF">操作：</td>
-      <td height="20" bgcolor="#FFFFFF">
-      	<input name="action" type="radio" class="np" id="checkradio" onClick="ShowHideMove()" value="check" checked='1' />
-        审核文档 
-        <input name="action" type="radio" class="np" value="makehtml" id="makehtmlradio" onClick="ShowHideMove()" />
-        更新HTML 
-        <input name="action" type="radio" class="np" value="move" id="moveradio" onClick="ShowHideMove()" />
-        移动文档 
-        <input name="action" type="radio" class="np" id="delradio" value="del" onClick="ShowHideMove()" />
-        删除文档</td>
-    </tr>
-    <tr height="20" bgcolor="#FFFFFF"> 
-      <td height="20" align="center" bgcolor="#FFFFFF">移动选项：</td>
-      <td height="20" bgcolor="#FFFFFF"> 
-        <?php
+      </tr>
+      <tr>
+        <td height="20" align="center" bgcolor="#FFFFFF">起始ID：</td>
+        <td height="20" bgcolor="#FFFFFF">开始：
+          <input name="startid" type="text" id="startid" size="10">
+          结束：
+          <input name="endid" type="text" id="endid" size="10"></td>
+      </tr>
+      <tr>
+        <td height="20" align="center" bgcolor="#FFFFFF">档案发布时间：</td>
+        <td height="20" bgcolor="#FFFFFF">
+          <table width="500" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td colspan="2"> <label>
+                  <input name="seltime" type="checkbox" class="np" id="seltime" value="1" onClick="ShowHideTime()">
+                  启用时间筛选（仅移动或删除文档可用该选项）</label></td>
+            </tr>
+            <tr id='seltimeField' style='display:none' height='20'>
+              <td width="250">开始：
+                <?php $nowtime = GetDateTimeMk(time()-(24*3600*30)); ?>
+                <input name="starttime" value="<?php echo $nowtime; ?>" type="text" id="starttime"
+                  style="width:120px" class="datepicker" />
+              </td>
+              <td width="250">结束：
+                <?php $nowtime = GetDateTimeMk(time()); ?>
+                <input name="endtime" value="<?php echo $nowtime; ?>" type="text" id="endtime" style="width:120px" class="datepicker" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="20" align="center" bgcolor="#FFFFFF">用户的登录id：</td>
+        <td height="20" bgcolor="#FFFFFF"><input name="userid" type="text" id="userid" size="20" />
+          (网址uid=后面跟的id)</td>
+      </tr>
+      <tr>
+        <td height="20" align="center" bgcolor="#FFFFFF">操作：</td>
+        <td height="20" bgcolor="#FFFFFF">
+          <input name="action" type="radio" class="np" id="checkradio" onClick="ShowHideMove()" value="check"
+            checked='1' />
+          审核文档
+          <input name="action" type="radio" class="np" value="makehtml" id="makehtmlradio" onClick="ShowHideMove()" />
+          更新HTML
+          <input name="action" type="radio" class="np" value="move" id="moveradio" onClick="ShowHideMove()" />
+          移动文档
+          <input name="action" type="radio" class="np" id="delradio" value="del" onClick="ShowHideMove()" />
+          删除文档</td>
+      </tr>
+      <tr height="20" bgcolor="#FFFFFF">
+        <td height="20" align="center" bgcolor="#FFFFFF">移动选项：</td>
+        <td height="20" bgcolor="#FFFFFF">
+          <?php
        echo "<span id='moveField' style='display:none'>新位置：";
        echo "<select name='newtypeid' style='width:250;'>\r\n";
        echo $typeOptions;
@@ -124,65 +144,70 @@
        echo "<br/>";
        echo "标题关键字：<input id='movekeyword' type='text' name='keyword' value='' style='width:220;'></span>";
 	  ?>
-      </td>
-    </tr>
-    <tr> 
-      <td height="31" colspan="2" bgcolor="#ffffff" align="center">
-      	<input name="b112" type="button" value="开始操作" onClick="document.form1.submit();" style="width:100px" class="coolbg np" />
-      </td>
-    </tr>
-  </form>
-  <tr bgcolor="#F9FCEF"> 
-    <td height="20" colspan="2"> <table width="100%">
-        <tr> 
-          <td width="74%">进行状态： </td>
-          <td width="26%" align="right"> <script language='javascript'>
-            	function ResizeDiv(obj,ty)
-            	{
-            		if(ty=="+") document.all[obj].style.pixelHeight += 50;
-            		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
-            	}
-            	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>] 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr bgcolor="#FFFFFF"> 
-    <td colspan="2" id="mtd">
-	<div id='mdv' style='width:100%;height:250;'> 
-        <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
-      </div>
-	 </td>
-  </tr>
-  <form name="form2" action="content_batchup_action.php" target="stafrm" method="post">
-    <input type="hidden" name="dopost" value="go">
-    <tr> 
-      <td height="20" colspan="2" background='images/tbg.gif'>
-      	<table width="98%" border="0" cellpadding="0" cellspacing="0">
-          <tr> 
-            <td width="30%" height="18" style="padding-left:10px;"><strong>错误文档修正：</strong></td>
-            <td width="70%" align="right">&nbsp;</td>
+        </td>
+      </tr>
+      <tr>
+        <td height="31" colspan="2" bgcolor="#ffffff" align="center">
+          <input name="b112" type="button" value="开始操作" onClick="document.form1.submit();" style="width:100px"
+            class="coolbg np" />
+        </td>
+      </tr>
+    </form>
+    <tr bgcolor="#F9FCEF">
+      <td height="20" colspan="2">
+        <table width="100%">
+          <tr>
+            <td width="74%">进行状态： </td>
+            <td width="26%" align="right">
+              <script language='javascript'>
+                function ResizeDiv(obj, ty) {
+                  if (ty == "+") document.all[obj].style.pixelHeight += 50;
+                  else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
+                }
+              </script>
+              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+            </td>
           </tr>
         </table>
-        </td>
-    </tr>
-    <tr height="20" bgcolor="#FFFFFF"> 
-      <td height="20" colspan="2" align="center" bgcolor="#FFFFFF">
-      	<input type='radio' value='delnulltitle' name='action' class='np' />
-        删除空标题的文章 
-        <input type='radio' value='delnullbody' name='action' class='np' />
-        删除内容为空的文章 
-        <input type='radio' value='modddpic' name='action' class='np' />
-        更正缩图错误
-       </td>
+      </td>
     </tr>
-    <tr> 
-      <td height="31" colspan="2" bgcolor="#F9FCEF" align="center">
-      	<input name="b112" type="button" value="开始操作" onClick="document.form2.submit();" style="width:100px" class="coolbg np" />
+    <tr bgcolor="#FFFFFF">
+      <td colspan="2" id="mtd">
+        <div id='mdv' style='width:100%;height:250;'>
+          <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
+        </div>
       </td>
     </tr>
-  </form>
-</table>
+    <form name="form2" action="content_batchup_action.php" target="stafrm" method="post">
+      <input type="hidden" name="dopost" value="go">
+      <tr>
+        <td height="20" colspan="2" background='images/tbg.gif'>
+          <table width="98%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="30%" height="18" style="padding-left:10px;"><strong>错误文档修正：</strong></td>
+              <td width="70%" align="right">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr height="20" bgcolor="#FFFFFF">
+        <td height="20" colspan="2" align="center" bgcolor="#FFFFFF">
+          <input type='radio' value='delnulltitle' name='action' class='np' />
+          删除空标题的文章
+          <input type='radio' value='delnullbody' name='action' class='np' />
+          删除内容为空的文章
+          <input type='radio' value='modddpic' name='action' class='np' />
+          更正缩图错误
+        </td>
+      </tr>
+      <tr>
+        <td height="31" colspan="2" bgcolor="#F9FCEF" align="center">
+          <input name="b112" type="button" value="开始操作" onClick="document.form2.submit();" style="width:100px"
+            class="coolbg np" />
+        </td>
+      </tr>
+    </form>
+  </table>
 </body>
+
 </html>

src/dede/templets/makehtml_all.htm

@@ -3,8 +3,44 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>一键更新</title>
+<!-- <link rel="stylesheet" href="../static/css/bootstrap.min.css"> -->
 <link href="css/base.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link href="../static/css/daterangepicker.css" rel="stylesheet">
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+<script type="text/javascript" src="../static/js/moment.min.js"></script>
+<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+<script language="javascript">
+  $(document).ready(function () {
+    $('.datepicker').daterangepicker({
+      "singleDatePicker": true,
+      "autoApply": true,
+      "showDropdowns": true,
+      "linkedCalendars": false,
+      "timePicker": true,
+      "timePicker24Hour": true,
+      // "timePickerSeconds": true,
+      "showCustomRangeLabel": false,
+      ranges: {
+        '今日': [moment(), moment()],
+        '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+        '本月': [moment().startOf('month'), moment().startOf('month')],
+        '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+      },
+      "locale": {
+        format: 'YYYY-MM-DD HH:mm',
+        applyLabel: '确定',
+        cancelLabel: '取消',
+        daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+        monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+          '七月', '八月', '九月', '十月', '十一月', '十二月'],
+        firstDay: 1
+      }
+    }, function (start) {
+      $(this).val(start.format("YYYY-MM-DD HH:mm"));
+    });
+
+  })
+</script>
 <script language='javascript'>
 function SelUp(){
    var ob1 = document.getElementById("uptype1");
@@ -46,15 +82,7 @@ function SelUp(){
     <tr id='seltime'>
       <td height="20"  bgcolor="#FFFFFF">&nbsp;&nbsp;起始时间：</td>
       <td height="20"  bgcolor="#FFFFFF">
-      	<input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time()); ?>" style="width:200px" />
-                            <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "starttime",
-						ifFormat       :    "%Y-%m-%d",
-						showsTime      :    false,
-						timeFormat     :    "24"
-					});
-				 </script>
+      	<input type="text" name="starttime" id="starttime" value="<?php echo GetDateMk(time()); ?>" style="width:200px" class="datepicker"/>
       </td>
     </tr>
     <tr bgcolor="#FFFFFF" id="selid" style="display:none;">

src/dede/templets/mytag_add.htm

@@ -1,45 +1,82 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>增加自定义标记</title>
-<link href='css/base.css' rel='stylesheet' type='text/css'>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript">
-function checkSubmit()
-{
-	if(document.form1.tagname.value=="")
-	{
-		alert("标记名称不能为空！");
-		document.form1.tagname.focus();
-		return false;
-	}
-}
-</script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>增加自定义标记</title>
+  <link href='css/base.css' rel='stylesheet' type='text/css'>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.tagname.value == "") {
+        alert("标记名称不能为空！");
+        document.form1.tagname.focus();
+        return false;
+      }
+    }
+
+    $(document).ready(function () {
+      $('.datepicker').daterangepicker({
+        "singleDatePicker": true,
+        "autoApply": true,
+        "showDropdowns": true,
+        "linkedCalendars": false,
+        "timePicker": true,
+        "timePicker24Hour": true,
+        // "timePickerSeconds": true,
+        "showCustomRangeLabel": false,
+        ranges: {
+          '今日': [moment(), moment()],
+          '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+          '本月': [moment().startOf('month'), moment().startOf('month')],
+          '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').startOf('month')]
+        },
+        "locale": {
+          format: 'YYYY-MM-DD HH:mm',
+          applyLabel: '确定',
+          cancelLabel: '取消',
+          daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+          monthNames: ['一月', '二月', '三月', '四月', '五月', '六月',
+            '七月', '八月', '九月', '十月', '十一月', '十二月'],
+          firstDay: 1
+        }
+      }, function (start) {
+        $(this).val(start.format("YYYY-MM-DD HH:mm:ss"));
+      });
+
+    })
+  </script>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf">
-<tr>
-  <td height="19" background="images/tbg.gif"  style="padding-left:10px;"><b><a href="mytag_main.php"><u>自定义标记管理</u></a></b>&gt;&gt;增加新标记</td>
-</tr>
-<tr>
-    <td height="200" bgcolor="#FFFFFF" valign="top">
-	<table width="100%" border="0" cellspacing="4" cellpadding="4">
-        <form action="mytag_add.php" method="post" enctype="multipart/form-data" name="form1" onSubmit="return checkSubmit()">
-          <input type='hidden' name='dopost' value='save' />
-          <input type="hidden" name="token" value="<?php echo make_hash();?>" />
-          <tr> 
-            <td height="25" colspan="3">自定义标记的调用方法：<br/>
-              {dede:mytag name='标记名称' ismake='是否含板块代码（yes 或 no）' typeid='栏目ID'/} 
-              <br/>
-              1、name 标记名称，该项是必须的属性，以下 2、3是可选属性；<br/>
-              2、ismake 默认是 no 表示设定的纯HTML代码， yes 表示含板块标记的代码；<br/>
-              3、typeid 表示所属栏目的ID，默认为 0 ，表示所有栏目通用的显示内容，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目ＩＤ。</td>
-          </tr>
-          <tr> 
-            <td width="15%" height="25" align="center">所属栏目：</td>
-            <td colspan="2"> 
-      <?php
+  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf">
+    <tr>
+      <td height="19" background="images/tbg.gif" style="padding-left:10px;"><b><a
+            href="mytag_main.php"><u>自定义标记管理</u></a></b>&gt;&gt;增加新标记</td>
+    </tr>
+    <tr>
+      <td height="200" bgcolor="#FFFFFF" valign="top">
+        <table width="100%" border="0" cellspacing="4" cellpadding="4">
+          <form action="mytag_add.php" method="post" enctype="multipart/form-data" name="form1"
+            onSubmit="return checkSubmit()">
+            <input type='hidden' name='dopost' value='save' />
+            <input type="hidden" name="token" value="<?php echo make_hash();?>" />
+            <tr>
+              <td height="25" colspan="3">自定义标记的调用方法：<br />
+                {dede:mytag name='标记名称' ismake='是否含板块代码（yes 或 no）' typeid='栏目ID'/}
+                <br />
+                1、name 标记名称，该项是必须的属性，以下 2、3是可选属性；<br />
+                2、ismake 默认是 no 表示设定的纯HTML代码， yes 表示含板块标记的代码；<br />
+                3、typeid 表示所属栏目的ID，默认为 0 ，表示所有栏目通用的显示内容，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目ＩＤ。</td>
+            </tr>
+            <tr>
+              <td width="15%" height="25" align="center">所属栏目：</td>
+              <td colspan="2">
+                <?php
            	$tl = new TypeLink(0);
            	$typeOptions = $tl->GetOptionArray(0,0,0);
             echo "<select name='typeid' style='width:300'>\r\n";
@@ -47,71 +84,57 @@ function checkSubmit()
             echo $typeOptions;
             echo "</select>";
 			?>
-            </td>
-          </tr>
-          <tr> 
-            <td height="25" align="center">标记名称：</td>
-            <td colspan="2"><input name="tagname" type="text" id="tagname" /></td>
-          </tr>
-          <tr> 
-            <td height="25" align="center">时间限制：</td>
-            <td colspan="2"><input name="timeset" type="radio" value="0" checked='1' />
-              永不过期 
-              <input type="radio" name="timeset" value="1" />
-              在设内时间内有效</td>
-          </tr>
-          <tr> 
-            <td height="25" align="center">开始时间：</td>
-            <td colspan="2">
-            	<input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" />
-                <script language="javascript" type="text/javascript">
-						Calendar.setup({
-							inputField     :    "starttime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script>
-            </td>
-          </tr>
-          <tr> 
-            <td height="25" align="center">结束时间：</td>
-            <td colspan="2">
-            	<input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" />
-                <script language="javascript" type="text/javascript">
-						    Calendar.setup({
-							inputField     :    "endtime",
-							ifFormat       :    "%Y-%m-%d %H:%M",
-							showsTime      :    true,
-							timeFormat     :    "24"
-						});
-				 </script>
-            </td>
-          </tr>
-          <tr> 
-            <td height="80" align="center">正常显示内容：</td>
-            <td width="76%">
-            	<textarea name="normbody" id="normbody" style="width:80%;height:100"></textarea>
-            </td>
-            <td width="9%">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td height="80" align="center">过期显示内容：</td>
-            <td>
-            	<textarea name="expbody" id="expbody" style="width:80%;height:100"></textarea>
-            </td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr> 
-            <td height="53" align="center">&nbsp;</td>
-            <td colspan="2">
-            	<input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" border="0" class='np' />
-            </td>
-          </tr>
-        </form>
-      </table>
-	 </td>
-</tr>
-</table>
+              </td>
+            </tr>
+            <tr>
+              <td height="25" align="center">标记名称：</td>
+              <td colspan="2"><input name="tagname" type="text" id="tagname" /></td>
+            </tr>
+            <tr>
+              <td height="25" align="center">时间限制：</td>
+              <td colspan="2"><input name="timeset" type="radio" value="0" checked='1' />
+                永不过期
+                <input type="radio" name="timeset" value="1" />
+                在设内时间内有效</td>
+            </tr>
+            <tr>
+              <td height="25" align="center">开始时间：</td>
+              <td colspan="2">
+                <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class="datepicker"/>
+              </td>
+            </tr>
+            <tr>
+              <td height="25" align="center">结束时间：</td>
+              <td colspan="2">
+                <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class="datepicker"/>
+              </td>
+            </tr>
+            <tr>
+              <td height="80" align="center">正常显示内容：</td>
+              <td width="76%">
+                <textarea name="normbody" id="normbody" style="width:80%;height:100"></textarea>
+              </td>
+              <td width="9%">&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="80" align="center">过期显示内容：</td>
+              <td>
+                <textarea name="expbody" id="expbody" style="width:80%;height:100"></textarea>
+              </td>
+              <td>&nbsp;</td>
+            </tr>
+            <tr>
+              <td height="53" align="center">&nbsp;</td>
+              <td colspan="2">
+                <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" border="0"
+                  class='np' />
+              </td>
+            </tr>
+          </form>
+        </table>
+      </td>
+    </tr>
+  </table>
 </body>
+
 </html>

src/dede/templets/soft_add.htm

@@ -5,11 +5,19 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
   <title>增加软件集</title>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
   <script language="javascript" src="js/main.js"></script>
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script language="javascript">
     function checkSubmit() {
       if (document.form1.title.value == '') {
@@ -54,6 +62,7 @@
     <input type="hidden" name="dopost" value="save" />
     <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
     <input type="hidden" name="cid" value="<?php echo $cid; ?>" />
+    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
       <tr>
         <td width="64%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
@@ -164,21 +173,24 @@
                   <tr>
                     <td height="30">
                       <input name="picname" type="text" id="picname" style="width:240px" />
-                      <input type="button" value="本地上传" style="width:70px;cursor:pointer;" />
-                      <iframe name='uplitpicfra' id='uplitpicfra' src='' style='display:none'></iframe>
-                      <span class="litpic_span"><input name="litpic" type="file" id="litpic"
-                          onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'soft_add.php');" size="1"
-                          class='np coolbg' /></span>
                       <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
                         onClick="SelectImage('form1.picname','small');" class='np coolbg' />
-                      <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;"
-                        onClick="imageCut('picname');" class='np coolbg' />
-                      <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程 </td>
+                      <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
+                      <span class="btn btn-success fileinput-button">
+                        <i class="glyphicon glyphicon-plus"></i>
+                        选择图片
+                        <input type="file" name="files[]" id="iptAddImages">
+                      </span>
+                      <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                        <i class="fa fa-trash-o"></i>
+                        <span>清空</span>
+                      </button>
+                    </td>
                   </tr>
                 </table>
               </td>
               <td width="150" align="center">
-                <div id='divpicview' class='divpre'></div>
+                <img id="litPic" src="../static/defaultpic.gif" style="height: 80px">
               </td>
             </tr>
           </table>
@@ -573,17 +585,8 @@
               <td width="241">
                 <?php
           $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200;\" >";
+          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker' style=\"width:200;\" >";
 			?>
-
-                <script language="javascript" type="text/javascript">
-                  Calendar.setup({
-                    inputField: "pubdate",
-                    ifFormat: "%Y-%m-%d %H:%M:%S",
-                    showsTime: true,
-                    timeFormat: "24"
-                  });
-                </script>
               </td>
               <td width="90">消费金币：</td>
               <td width="379">

src/dede/templets/soft_edit.htm

@@ -5,11 +5,19 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
   <title>编辑软件</title>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script language="javascript" src="js/main.js"></script>
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script language="javascript">
     function checkSubmit() {
       if (document.form1.title.value == '') {
@@ -43,6 +51,7 @@
     <input type="hidden" name="dopost" value="save" />
     <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
     <input type="hidden" name="id" value="<?php echo $aid?>" />
+    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
       <tr>
         <td width="85%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
@@ -153,19 +162,26 @@
               <td width="90" height="81">
                 &nbsp;缩 略 图：
               </td>
-              <td width="500">
-                <input name="picname" type="text" id="picname" style="width:250px"
-                  value="<?php echo $arcRow["litpic"]?>" />
-                <input type="button" name="Submit" value="浏览..." style="width:70px"
-                  onClick="SelectImage('form1.picname','');" />
-                <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');"
-                  class='np coolbg' />
-                <input type='checkbox' class='np' name='ddisremote' value='1' />
+              <td width="560">
+                <input name="picname" type="text" id="picname" style="width:300px"
+                  value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
+                  style="width:70px" onClick="SelectImage('form1.picname','');">
+                <input type='checkbox' class='np' name='ddisremote' value='1'>
                 远程
+                <span class="btn btn-success fileinput-button">
+                  <i class="glyphicon glyphicon-plus"></i>
+                  选择图片
+                  <input type="file" name="files[]" id="iptAddImages">
+                </span>
+                <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                  <i class="fa fa-trash-o"></i>
+                  <span>清空</span>
+                </button>
               </td>
               <td align="center">
-                <img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>"
-                  width="150" height="100" id="picview" name="picview" />
+                <img id="litPic"
+                  src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+                  style="height: 80px">
               </td>
             </tr>
           </table>
@@ -514,17 +530,8 @@ if($cfg_need_typeid2=='Y') {
             <td width="241">
               <?php
           $nowtime = GetDateTimeMk($arcRow["pubdate"]);
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200;\" >";
+          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200;\" class='datepicker' >";
 			?>
-
-              <script language="javascript" type="text/javascript">
-                Calendar.setup({
-                  inputField: "pubdate",
-                  ifFormat: "%Y-%m-%d %H:%M:%S",
-                  showsTime: true,
-                  timeFormat: "24"
-                });
-              </script>
             </td>
             <td width="92">消费金币：</td>
             <td width="368">

src/dede/templets/spec_add.htm

@@ -8,11 +8,19 @@ body {
 	background-image: url(images/allbg.gif);
 }
 </style>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
 <script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+<link href="../static/css/daterangepicker.css" rel="stylesheet">
+<script type="text/javascript" src="../static/js/moment.min.js"></script>
+<script type="text/javascript" src="../static/js/daterangepicker.js"></script>
 <script language='javascript' src='js/main.js'></script>
+<link href="../static/css/cropper.min.css" rel="stylesheet">
+<script src="../static/js/cropper.min.js"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
 <script language="javascript">
 function checkSubmit(){
 	if(document.form1.title.value==""){
@@ -59,6 +67,16 @@ function CheckVal(id){
    }
 }
 </script>
+<style>
+  img {
+    vertical-align: baseline;
+  }
+
+  input,
+  select {
+    height: auto !important;
+  }
+</style>
 </head>
 <body topmargin="8">
 <form name="form1" action="spec_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
@@ -66,6 +84,7 @@ function CheckVal(id){
   <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
   <input type="hidden" name="arcrank" value="0" />
   <input type="hidden" name="source" value="本站" />
+  <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
     <tr>
       <td width="85%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="content_s_list.php"><u>专题列表</u></a><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"></a> &gt;&gt; 发布专题</td>
@@ -128,18 +147,22 @@ function CheckVal(id){
             <td width="560"><table width="100%" border="0" cellspacing="1" cellpadding="1">
                 <tr>
                   <td height="30"><input name="picname" type="text" id="picname" style="width:240px" />
-                    <input type="button"  value="本地上传" style="width:70px;cursor:pointer;" />
-                    <iframe name='uplitpicfra' id='uplitpicfra' src='' style='display:none'></iframe>
-                    <span class="litpic_span">
-                    <input name="litpic" type="file" id="litpic"  onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'spec_add.php');" size="1" class='np coolbg'/>
+                    <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
+                      onClick="SelectImage('form1.picname','small');" class='np coolbg' />
+                    <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
+                    <span class="btn btn-success fileinput-button">
+                      <i class="glyphicon glyphicon-plus"></i>
+                      选择图片
+                      <input type="file" name="files[]" id="iptAddImages">
                     </span>
-                    <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;" onClick="SelectImage('form1.picname','small');" class='np coolbg'/>
-                    <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-                    <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'/>
-                    远程图片 </td>
+                    <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                      <i class="fa fa-trash-o"></i>
+                      <span>清空</span>
+                    </button>
+                  </td>
                 </tr>
               </table></td>
-            <td width="150" align="center"><div id='divpicview' class='divpre'></div></td>
+            <td width="150" align="center"><img id="litPic" src="../static/defaultpic.gif" style="height: 80px"></td>
           </tr>
         </table></td>
     </tr>
@@ -225,16 +248,9 @@ function CheckVal(id){
             <td width="90">&nbsp;发布时间：</td>
             <td><?php
               $nowtime = GetDateTimeMk(time());
-              echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200px\" />";
+              echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200px\" class='datepicker'/>";
 			        ?>
-              <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "pubdate",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script></td>
+              </td>
           </tr>
         </table></td>
     </tr>

src/dede/templets/spec_edit.htm

@@ -10,11 +10,19 @@
       background-image: url(images/allbg.gif);
     }
   </style>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <link href="../static/css/daterangepicker.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+  <script type="text/javascript" src="../static/js/moment.min.js"></script>
+  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
   <script language='javascript' src='js/main.js'></script>
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script language="javascript">
     function SelectTemplets(fname) {
       if (document.all) {
@@ -63,6 +71,16 @@
       }
     }
   </script>
+  <style>
+    img {
+      vertical-align: baseline;
+    }
+  
+    input,
+    select {
+      height: auto !important;
+    }
+  </style>
 </head>
 
 <body topmargin="8">
@@ -73,6 +91,7 @@
     <input type="hidden" name="arcrank" value="<?php echo $arcRow['arcrank']?>" />
     <input type="hidden" name="source" value="本站" />
     <input type="hidden" name="dopost" value="save" />
+    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
       <tr>
         <td width="85%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
@@ -158,18 +177,26 @@
               <td width="90" height="90">
                 &nbsp;缩 略 图：
               </td>
-              <td width="500">
-                <input name="picname" type="text" id="picname" style="width:250px"
-                  value="<?php echo $arcRow["litpic"]?>" />
-                <input type="button" name="Submit" value="浏览..." style="width:70px"
-                  onClick="SelectImage('form1.picname','');" />
-                <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');"
-                  class='np coolbg' />
-                <input type='checkbox' class='np' name='ddisremote' value='1' />远程
+              <td width="560">
+                <input name="picname" type="text" id="picname" style="width:300px"
+              value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
+              style="width:70px" onClick="SelectImage('form1.picname','');">
+            <input type='checkbox' class='np' name='ddisremote' value='1'>
+            远程
+            <span class="btn btn-success fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
+              选择图片
+              <input type="file" name="files[]" id="iptAddImages">
+            </span>
+            <button id="btnClearAll" type="button" class="btn btn-danger delete">
+              <i class="fa fa-trash-o"></i>
+              <span>清空</span>
+            </button>
               </td>
               <td align="center">
-                <img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>"
-                  width="150" height="100" id="picview" name="picview" />
+                <img id="litPic"
+              src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+              style="height: 80px">
               </td>
             </tr>
           </table>
@@ -334,16 +361,8 @@
 
                 <?php
 			         $nowtime = GetDateTimeMk($arcRow["pubdate"]);
-			         echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200px\" />";
+			         echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200px\" class='datepicker'/>";
 		          ?>
-                <script language="javascript" type="text/javascript">
-                  Calendar.setup({
-                    inputField: "pubdate",
-                    ifFormat: "%Y-%m-%d %H:%M:%S",
-                    showsTime: true,
-                    timeFormat: "24"
-                  });
-                </script>
               </td>
               <td width="234">&nbsp;</td>
             </tr>

src/dede/templets/video_add.htm

@@ -1,418 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-  <title>增加视频</title>
-  <link href="css/base.css" rel="stylesheet" type="text/css">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
-  <script language="javascript" src="js/main.js"></script>
-  <script language="javascript" src="inc/spark/js/swfobject.js"></script>
-  <script language="javascript">
-    function checkSubmit() {
-      if (document.form1.title.value == "") {
-        alert("视频名称不能为空！");
-        document.form1.title.focus();
-        return false;
-      }
-      if (document.form1.typeid.value == 0) {
-        alert("请选择档案的主类别！");
-        return false;
-      }
-      if (document.form1.videourl.value == "") {
-        alert("视频地址不能为空");
-        return false;
-      }
-    }
-
-    if ($Nav() != "IE") ShowObj('adset');
-
-  </script>
-</head>
-
-<body topmargin="8">
-  <form name="form1" action="video_add.php" enctype="multipart/form-data" method="post"
-    onSubmit="return checkSubmit();">
-    <input type="hidden" name="dopost" value="save" />
-    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-    <input type="hidden" name="cid" value="<?php echo $cid; ?>" />
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-        <td width="64%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
-            href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>视频列表</u></a>&gt;&gt;发布新视频
-        </td>
-        <td align="right">&nbsp; <a href="catalog_main.php">[<u>栏目管理</u>]</a>
-        </td>
-      </tr>
-    </table>
-
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
-      <tr>
-        <td colspan="2">
-          <table border="0" cellpadding="0" cellspacing="0">
-            <tr>
-              <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                  onClick="ShowItem2()"><u>高级参数</u></a></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
-      <tr>
-        <td colspan="2">
-          <table height="24" border="0" cellpadding="0" cellspacing="0">
-            <tr>
-              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                  onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
-              <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-
-
-
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
-      <tr>
-        <td height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;视频名称：</td>
-              <td width='408'><input name="title" type="text" id="title" style="width:388px"> </td>
-              <td width="90">&nbsp;简略标题：</td>
-              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"> </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td width="400%" height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;自定义属性：</td>
-              <td>
-                <?php
-         $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
-         $dsql->Execute();
-         while($trow = $dsql->GetObject())
-         {
-         	if($trow->att=='j')
-         	{
-         		$jumpclick = " onclick='ShowUrlTr()'";
-         	}
-         	else
-         	{
-         		$jumpclick = '';
-         	}
-         	if(ereg($trow->att,$arcRow['flag']))
-         	{
-         		echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' />{$trow->attname}[{$trow->att}]";
-         	}
-
-         	else
-         	{
-         		echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} />{$trow->attname}[{$trow->att}]";
-         	}
-         }
-          ?>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td height="24" class="bline" id="redirecturltr" style="display:none">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;跳转网址：</td>
-              <td>
-                <input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" /> </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td width="400%" height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;TAG标签：</td>
-              <td><input name="tags" type="text" id="tags" value="" style="width:300px"
-                  onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr id="pictable">
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90"> &nbsp;缩 略 图：</td>
-              <td width="560">
-                <table width="100%" border="0" cellspacing="1" cellpadding="1">
-                  <tr>
-                    <td height="30">
-                      <input name="picname" type="text" id="picname" style="width:240px" />
-                      <input type="button" value="本地上传" style="width:70px;cursor:pointer;" />
-                      <iframe name='uplitpicfra' id='uplitpicfra' src='' width='200' height='200'
-                        style='display:none'></iframe>
-                      <span class="litpic_span"><input name="litpic" type="file" id="litpic"
-                          onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'video_add.php');" size="1"
-                          class='np coolbg' /></span>
-                      <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
-                        onClick="SelectImage('form1.picname','small');" class='np coolbg' />
-                      <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;"
-                        onClick="imageCut('picname');" class='np coolbg' />
-                      <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
-                    </td>
-                  </tr>
-                </table>
-              </td>
-              <td width="150" align="center">
-                <div id='divpicview' class='divpre'></div>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;视频来源：</td>
-              <td width="240">
-                <input name="source" type="text" id="source" style="width:200px"> </td>
-              <td width="90">视频作者：</td>
-              <td width="159"><input name="writer" type="text" id="writer" style="width:120px"></td>
-              <td>&nbsp;</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-
-
-
-            <tr>
-              <td width="90">&nbsp;视频主栏目：</td>
-              <td>
-                <span id='typeidct'>
-                  <?php
-          $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
-          echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-          echo "<option value='0'>请选择栏目...</option>\r\n";
-          echo $typeOptions;
-          echo "</select>";
-			?></span>
-                <img src='images/menusearch.gif' style='cursor:pointer;'
-                  onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-                &nbsp;
-                <?php
-			if($cfg_need_typeid2=='Y')
-			{
-				echo "<a href='javascript:AddTypeid2();'>【<u>选择副栏目</u>】</a>";
-			}
-			?>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr id='typeid2tr' style='display:none'>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;视频副栏目：</td>
-              <td>
-                <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
-                  style='width:200px;' />
-                <img src='images/menusearch2.gif' style='cursor:pointer;'
-                  onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>视频地址：</strong></td>
-      </tr>
-      <tr>
-        <td height="24" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;视频地址：</td>
-              <td>
-                <input name="videourl" type="text" id="videourl" style="width:300px;float:left;margin-right:5px;">
-                <div style='float:left;'>
-                  <!-- cc视频插件代码 -->
-                  <object width='72' height='24'>
-                    <param name='wmode' value='transparent' />
-                    <param name='allowScriptAccess' value='always' />
-                    <param name='movie'
-                      value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他' />
-                    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他'
-                      type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always'
-                      wmode='transparent'></embed>
-                  </object>
-                  <!-- cc视频插件代码 -->
-                </div>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
-      </tr>
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;内容摘要：</td>
-              <td width="500"><textarea name="description" rows="3" id="description"
-                  style="width:80%;height:200px;"></textarea></td>
-              <td>&nbsp;</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-
-    <!-- //高级参数 -->
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-      style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90" height="22">&nbsp;文章排序：</td>
-              <td width="240"> <select name="sortup" id="sortup" style="width:150">
-                  <option value="0" selected>默认排序</option>
-                  <option value="7">置顶一周</option>
-                  <option value="30">置顶一个月</option>
-                  <option value="90">置顶三个月</option>
-                  <option value="180">置顶半年</option>
-                  <option value="360">置顶一年</option>
-                </select> </td>
-              <td width="90">标题颜色：</td>
-              <td>
-                <input name="color" type="text" id="color" style="width:120px">
-                <input type="button" onclick="ShowColor(event,this)" value="选取" id="modcolor" name="modcolor">
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;阅读权限：</td>
-              <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
-                  <?php
-                $urank = $cuserLogin->getUserRank();
-                $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
-                $dsql->Execute();
-                while($row = $dsql->GetObject())
-                {
-                	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
-                }
-              ?>
-                </select> </td>
-              <td width="90">发布选项：</td>
-              <td>
-                <input name="ishtml" type="radio" class="np" value="1" checked>
-                生成HTML
-                <input type="radio" name="ishtml" class="np" value="0">
-                仅动态浏览 </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;发布时间：</td>
-              <td width="241"><?php
-          $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
-			?> </td>
-              <td width="90">消费点数：</td>
-              <td width="379"><input name="money" type="text" id="money" value="0" size="10"> </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;关键字：</td>
-              <td colspan="2"><input type='text' name="keywords" id="keywords" style="width:290px;" value="" /><input
-                  name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey" value="1"
-                  <?php if($cfg_arc_autokeyword=='Y') echo ' checked'; ?>>
-                <input type="button" name="Submit" value="浏览..." style="width:56;height:20"
-                  onClick="SelectKeywords('form1.keywords');">&nbsp;&nbsp;自动获取，手动填写用","分开</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td height="24" colspan="4" class="bline">
-          <table width="800" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td width="90">&nbsp;自定义文件名：</td>
-              <td width="449"><input type="text" name="filename" id="filename" />不包括后缀名如.html等</td>
-              <td width="261">&nbsp;</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td height="24" colspan="4">&nbsp;</td>
-      </tr>
-    </table>
-
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
-      style="border:1px solid #cfcfcf;border-top:none;">
-      <tr>
-        <td height="35">
-          <table width="100%" border="0" cellspacing="1" cellpadding="1">
-            <tr>
-              <td width="17%">&nbsp;</td>
-              <td width="83%">
-                <table width="214" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
-                        height="22" class="np" border="0"></td>
-                    <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
-                        onClick="location.reload();" style="cursor:pointer;"></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </form>
-  <script language='javascript'>InitPage();</script>
-</body>
-
-</html>

src/dede/templets/video_edit.htm

@@ -1,392 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-  <title>编辑视频</title>
-  <link href="css/base.css" rel="stylesheet" type="text/css">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <script type="text/javascript" src="js/calendar/calendar.js"></script>
-  <script language="javascript" src="js/main.js"></script>
-  <script language="javascript" src="inc/spark/js/swfobject.js"></script>
-  <script language="javascript">
-      function checkSubmit() {
-        if (document.form1.title.value == "") {
-          alert("视频名称不能为空！");
-          document.form1.title.focus();
-          return false;
-        }
-        if (document.form1.typeid.value == 0) {
-          alert("请选择档案的主类别！");
-          return false;
-        }
-        if (document.form1.videourl.value == "") {
-          alert("视频地址不能为空");
-          return false;
-        }
-      }
-
-    if ($Nav() != "IE") ShowObj('adset');
-  </script>
-</head>
-<body topmargin="8">
-<form name="form1" action="video_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
-<input type="hidden" name="dopost" value="save" />
-<input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-<input type="hidden" name="cid" value="<?php echo $cid; ?>" />
-<input type="hidden" name="id" value="<?php echo $aid?>" />
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-    <tr>
-      <td width="64%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>视频列表</u></a>&gt;&gt;发布新视频</td>
-      <td align="right">&nbsp; <a href="catalog_main.php">[<u>栏目管理</u>]</a>
-      </td>
-    </tr>
-  </table>
-  
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
-    <tr>
-      <td colspan="2">
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>高级参数</u></a></td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
-    <tr>
-      <td colspan="2"> <table height="24" border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
- 
-  
-
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24"  class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;视频名称：</td>
-          <td width='408'><input name="title" type="text" value="<?php echo $arcRow['title']; ?>" id="title" style="width:388px">          </td>
-          <td width="90">&nbsp;简略标题：</td>
-          <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px" value="<?php echo $arcRow['shorttitle']; ?>" >          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义属性：</td>
-          <td>
-         <?php
-		    $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
-		    $dsql->Execute();
-		    while($trow = $dsql->GetObject())
-		    {
-		    	if($trow->att=='j') $jumpclick = " onclick='ShowUrlTr()'";
-		    	else $jumpclick = '';
-		    	if(preg_match("#".$trow->att."#",$arcRow['flag']))
-		    	echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' />{$trow->attname}[{$trow->att}]";
-		    	else
-		    	echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} />{$trow->attname}[{$trow->att}]";
-		    }
-          ?>
-           </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline" id="redirecturltr" style="display:none">
-	   <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;跳转网址：</td>
-            <td>
-            	<input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="<?php echo $addRow["redirecturl"]?>"  />            </td>
-          </tr>
-       </table>       </td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;TAG标签：</td>
-          <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>"  style="width:300px" onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
-        </tr>
-      </table>
-      </td>
-    </tr>
-   <tr id="pictable">
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90"> &nbsp;缩 略 图：</td>
-            <td width="560">
-            	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-                <tr>
-                  <td height="30">
-                  <input name="picname" type="text" id="picname" style="width:240px" value="<?php echo $arcRow["litpic"]?>" />
-                  <input type="button"  value="本地上传" style="width:70px;cursor:pointer;" />
-                  <iframe name='uplitpicfra' id='uplitpicfra' src='' width='200' height='200' style='display:none'></iframe>
-                  <span class="litpic_span"><input name="litpic" type="file" id="litpic"  onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'video_edit.php');" size="1" class='np coolbg'/></span>
-                  <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;" onClick="SelectImage('form1.picname','small');" class='np coolbg'/>
-                  <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-                  <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'/>远程
-                  </td>
-                </tr>
-              </table>
-             </td>
-            <td width="150" align="center">
-            <div id='divpicview' class='divpre'></div>
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-
-    <tr>
-      <td height="24"  class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;视频来源：</td>
-            <td width="240">
-              <input name="source" type="text" id="source" style="width:200px"  value="<?php echo $arcRow["source"]?>">            </td>
-            <td width="90">视频作者：</td>
-            <td width="159"><input name="writer" type="text" id="writer" style="width:120px"  value="<?php echo $arcRow["writer"]?>"></td>
-			<td>&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-
-
-
-		  <tr>
-          <td width="90">&nbsp;视频主栏目：</td>
-           <td>
-          <?php
-          $typeOptions = GetOptionList($arcRow["typeid"],$cuserLogin->getUserChannel(),$channelid);
-          echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-          if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择主分类...</option>\r\n";
-          echo $typeOptions;
-          echo "</select>";
-			    ?> 
-			    <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid', '<?php echo $arcRow['typeid']; ?>')" alt='快捷选择' title='快捷选择' />
-                <?php 
-     			 if($cfg_remote_site=='Y')
-     			 {
-   				 ?> 　 
-     				 <input name="isremote" type="checkbox" id="isremote" value="1" <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布  <?php GetFtp();?>     <?php
-     			 }
-    		?>  
-            </td>
-        </tr>
-        </table>       </td>
-    </tr>
-
-	<tr id='typeid2tr' style='display:none'>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;视频副栏目：</td>
-          <td>
-          <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value='' style='width:200px;' />
-          <img src='images/menusearch2.gif' style='cursor:pointer;' onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
-			    </td>
-        </tr>
-        </table>
-      </td>
-    </tr>
-    
-    <tr>
-      <td height="24"  bgcolor="#F1F5F2" class="bline2"><strong>视频地址：</strong></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;视频地址：</td>
-            <td>
-                <input name="videourl" type="text" id="videourl" style="width:300px;float:left;margin-right:5px;" value="<?php echo $addRow["videourl"]?>">
-                <div style='float:left;'>
-                      <!-- cc视频插件代码 -->
-  <object width='72' height='24'>
-    <param name='wmode' value='transparent' />
-    <param name='allowScriptAccess' value='always' />
-    <param name='movie' value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他' />
-    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他'
-      type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always'
-      wmode='transparent'></embed>
-  </object>
-  <!-- cc视频插件代码 -->
-  </div>
-  </td>
-  </tr>
-  </table>
-  </td>
-  </tr>
-
-  <tr>
-    <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
-  </tr>
-  <tr>
-    <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;内容摘要：</td>
-          <td width="500"><textarea name="description" rows="3" id="description"
-              style="width:80%;height:200px;"><?php echo $arcRow["description"]?></textarea></td>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  </table>
-
-  <!-- //高级参数 -->
-  <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-    style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24" colspan="4" class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="22">&nbsp;文章排序：</td>
-            <td width="240"> <select name="sortup" id="sortup" style="width:150">
-                <?php
-                $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
-                echo "<option value='0'>正常排序</option>\r\n";
-                if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
-                ?>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-              </select> </td>
-            <td width="90">标题颜色：</td>
-            <td>
-              <input name="color" type="text" id="color" style="width:120px">
-              <input type="button" onclick="ShowColor(event,this)" value="选取" id="modcolor" name="modcolor">
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;阅读权限：</td>
-            <td width="250">
-              <select name="arcrank" id="arcrank" style="width:150px">
-                <option value='<?php echo $arcRow["arcrank"]; ?>'>
-                  <?php echo ($arcRow["arcrank"]==0 ? '已审核状态' : $arcRow["rankname"]); ?></option>
-                <option value='0'>已审核状态</option>
-                <option value='-1'>未审核状态</option>
-              </select>
-            </td>
-            <td width="90">发布选项：</td>
-            <td> <input name="ishtml" type="radio" class="np" value="1"
-                <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>
-              仅动态浏览 </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-
-    <tr>
-      <td height="75" class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;更新时间：</td>
-            <td width="241">
-              <?php
-          $nowtime = GetDateTimeMk($arcRow["pubdate"]);
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200;\" >";
-			?>
-
-              <script language="javascript" type="text/javascript">
-                Calendar.setup({
-                  inputField: "pubdate",
-                  ifFormat: "%Y-%m-%d %H:%M:%S",
-                  showsTime: true,
-                  timeFormat: "24"
-                });
-              </script>
-            </td>
-            <td width="92">消费金币：</td>
-            <td width="368">
-              <input name="money" type="hidden" id="money" value="<?php echo $arcRow["money"]?>" />(此项已经独立分离)
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="51">&nbsp;关键字：</td>
-            <td>
-              <input type="text" name="keywords" id="keywords" style="width:60%"
-                value="<?php echo $arcRow["keywords"]?>" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-
-    <tr>
-      <td height="24" colspan="4" class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;自定义文件名：</td>
-            <td width="449"><input type="text" name="filename" id="filename"
-                value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
-            <td width="261">&nbsp;</td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4">&nbsp;</td>
-    </tr>
-  </table>
-
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
-    style="border:1px solid #cfcfcf;border-top:none;">
-    <tr>
-      <td height="35">
-        <table width="100%" border="0" cellspacing="1" cellpadding="1">
-          <tr>
-            <td width="17%">&nbsp;</td>
-            <td width="83%">
-              <table width="214" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
-                      height="22" class="np" border="0"></td>
-                  <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
-                      onClick="location.reload();" style="cursor:pointer;"></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-  </form>
-  <script language='javascript'>InitPage();</script>
-  </body>
-
-</html>

src/include/customfields.func.php

@@ -124,15 +124,7 @@ function GetFormItem($ctag, $admintype='admin')
     else if($fieldType=="datetime")
     {
         $nowtime = GetDateTimeMk(time());
-        $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" style=\"width:250px\" class=\"intxt\"  />";
-        $innertext .= "   <script language=\"javascript\" type=\"text/javascript\">
-                    Calendar.setup({
-                        inputField     :    \"$fieldname\",
-                        ifFormat       :    \"%Y-%m-%d %H:%M\",
-                        showsTime      :    true,
-                        timeFormat     :    \"24\"
-                    });
-                 </script>";
+        $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" style=\"width:250px\" class=\"intxt datepicker\"/>";
     }
     else if($fieldType=='img'||$fieldType=='imgfile')
     {
@@ -514,15 +506,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype='admin', $fieldname='')
     else if($ftype=="datetime")
     {
         $nowtime = GetDateTimeMk($fvalue);
-        $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" style=\"width:250px\" class=\"intxt\" />";
-        $innertext .= "   <script language=\"javascript\" type=\"text/javascript\">
-                    Calendar.setup({
-                        inputField     :    \"$fieldname\",
-                        ifFormat       :    \"%Y-%m-%d %H:%M\",
-                        showsTime      :    true,
-                        timeFormat     :    \"24\"
-                    });
-                 </script>";
+        $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" style=\"width:250px\" class=\"intxt datepicker\" />";
     }
     else if($ftype=="img")
     {

src/member/templets/js/calendar-green.css

@@ -1,239 +0,0 @@
-/* The main calendar widget.  DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
-  border: 1px solid #CDE4B3;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #F9FCF1;
-  font-family: tahoma,verdana,sans-serif;
-}
-
-.calendar table{border: 1px solid #fff;}
-/* Header part -- contains navigation buttons and day names. */
-.calendar table thead td{background:#E7F6D5; color:#97C069; border-bottom:1px solid #fff; border-right:none; height:16px; width:18px}
-.calendar table thead tr.headrow td{ background:#EDF9E0}
-.headrow{border-top:1px solid #CDE4B3}
-
-.calendar table thead td.button div div{
-	background-image: url(../../images/question-balloon.png);
-	background-repeat: no-repeat; text-indent:-100px; overflow:hidden
-}
-.headrow .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;    /* They are the navigation buttons */
-  border-right:1px solid #FFF; padding:0
-}
-.headrow .button div,.calendar table .wn div{border-right:1px solid #CDE4B3; height:23px; line-height:23px}
-.calendar .nav {
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;      /* Pressing it will take you to the current date */
-  text-align: center;
-  padding: 2px;
-  color:#6b9936; width:auto
-}
-
-.calendar thead tr { /* Row <TR> containing navigation buttons */
-  background: #007ED1;
-  color: #fff;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-  background: #EDF9E0;
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #CDE4B3;
-  padding: 2px;
-  text-align: center;
-  color: #000;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-  color: #a66;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background-color: #E7F6D5;
-  color: #6b9936;
-
-}
-
-
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  width: 2em;
-  color: #456;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day div{ padding-right:5px}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #bbb;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #fbb;
-}
-
-.calendar table .wn {
-  border-right: 1px solid #fff;
-  background: #EDF9E0; padding:0
-}
-
-.calendar tbody .rowhilite td {
-  background: #def;
-}
-
-.calendar tbody .rowhilite td.wn {
-  background: #F9FCF1;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: #93b9e2;
-  padding: 1px 3px 1px 1px;
-  color:#fff
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-  background: #cde;
-  padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.selected { /* Cell showing today date */
-  font-weight: bold;
-  padding: 1px 3px 1px 1px;
-  background: #ff7200;
-  color: #fff;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-  color: #a66;
-}
-
-.calendar tbody td.today { /* Cell showing selected date */
-  font-weight: bold;
-  color: #D50000;
-}
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-  text-align: center;
-  background: #206A9B;
-  color: #fff;
-}
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  background: #EDF9E0;
-  color: #6b9936;
-  border-top: 1px solid #CDE4B3;
-  padding: 1px; height:24px
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  background: #B8DAF0;
-  border: 1px solid #178AEB;
-  color: #000;
-  padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  background: #006AA9;
-  padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  top: 0px;
-  left: 0px;
-  width: 4em;
-  cursor: default;
-  border: 1px solid #655;
-  background: #def;
-  color: #000;
-  font-size: 90%;
-  z-index: 9999999999999999999999999999;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .hilite {
-  background: #34ABFA;
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  font-weight: bold;
-}
-
-.calendar .combo .active {
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  background: #F9FCF1;
-  font-weight: bold;
-}
-
-.calendar td.time {
-  border-top: 1px solid #CDE4B3;
-  padding: 1px 0px;
-  text-align: center;
-  background-color: #EDF2E3;
-  height:24px
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 3px 0px 4px;
-  border: 1px solid #889;
-  font-weight: bold;
-  background-color: #F9FCF1;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  border-color: #000;
-  background-color: #267DB7;
-  color: #fff;
-}
-
-.calendar td.time span.active {
-  border-color: red;
-  background-color: #000;
-  color: #A5FF00;
-}
-.calendar thead .active div{ /* Active (pressed) buttons in header */
-  background: #bdd2e8;
-}

src/member/templets/js/calendar/calendar-green.css

@@ -1,239 +0,0 @@
-/* The main calendar widget.  DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
-  border: 1px solid #CDE4B3;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #F9FCF1;
-  font-family: tahoma,verdana,sans-serif;
-}
-
-.calendar table{border: 1px solid #fff;}
-/* Header part -- contains navigation buttons and day names. */
-.calendar table thead td{background:#E7F6D5; color:#97C069; border-bottom:1px solid #fff; border-right:none; height:16px; width:18px}
-.calendar table thead tr.headrow td{ background:#EDF9E0}
-.headrow{border-top:1px solid #CDE4B3}
-
-.calendar table thead td.button div div{
-	background-image: url(../../images/question-balloon.png);
-	background-repeat: no-repeat; text-indent:-100px; overflow:hidden
-}
-.headrow .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;    /* They are the navigation buttons */
-  border-right:1px solid #FFF; padding:0
-}
-.headrow .button div,.calendar table .wn div{border-right:1px solid #CDE4B3; height:23px; line-height:23px}
-.calendar .nav {
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;      /* Pressing it will take you to the current date */
-  text-align: center;
-  padding: 2px;
-  color:#6b9936; width:auto
-}
-
-.calendar thead tr { /* Row <TR> containing navigation buttons */
-  background: #007ED1;
-  color: #fff;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-  background: #EDF9E0;
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #CDE4B3;
-  padding: 2px;
-  text-align: center;
-  color: #000;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-  color: #a66;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background-color: #E7F6D5;
-  color: #6b9936;
-
-}
-
-
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  width: 2em;
-  color: #456;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day div{ padding-right:5px}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #bbb;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #fbb;
-}
-
-.calendar table .wn {
-  border-right: 1px solid #fff;
-  background: #EDF9E0; padding:0
-}
-
-.calendar tbody .rowhilite td {
-  background: #def;
-}
-
-.calendar tbody .rowhilite td.wn {
-  background: #F9FCF1;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: #93b9e2;
-  padding: 1px 3px 1px 1px;
-  color:#fff
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-  background: #cde;
-  padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.selected { /* Cell showing today date */
-  font-weight: bold;
-  padding: 1px 3px 1px 1px;
-  background: #ff7200;
-  color: #fff;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-  color: #a66;
-}
-
-.calendar tbody td.today { /* Cell showing selected date */
-  font-weight: bold;
-  color: #D50000;
-}
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-  text-align: center;
-  background: #206A9B;
-  color: #fff;
-}
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  background: #EDF9E0;
-  color: #6b9936;
-  border-top: 1px solid #CDE4B3;
-  padding: 1px; height:24px
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  background: #B8DAF0;
-  border: 1px solid #178AEB;
-  color: #000;
-  padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  background: #006AA9;
-  padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  top: 0px;
-  left: 0px;
-  width: 4em;
-  cursor: default;
-  border: 1px solid #655;
-  background: #def;
-  color: #000;
-  font-size: 90%;
-  z-index: 9999999999999999999999999999;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .hilite {
-  background: #34ABFA;
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  font-weight: bold;
-}
-
-.calendar .combo .active {
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  background: #F9FCF1;
-  font-weight: bold;
-}
-
-.calendar td.time {
-  border-top: 1px solid #CDE4B3;
-  padding: 1px 0px;
-  text-align: center;
-  background-color: #EDF2E3;
-  height:24px
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 3px 0px 4px;
-  border: 1px solid #889;
-  font-weight: bold;
-  background-color: #F9FCF1;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  border-color: #000;
-  background-color: #267DB7;
-  color: #fff;
-}
-
-.calendar td.time span.active {
-  border-color: red;
-  background-color: #000;
-  color: #A5FF00;
-}
-.calendar thead .active div{ /* Active (pressed) buttons in header */
-  background: #bdd2e8;
-}

src/static/css/daterangepicker.css

@@ -0,0 +1,410 @@
+.daterangepicker {
+  position: absolute;
+  color: inherit;
+  background-color: #fff;
+  border-radius: 4px;
+  border: 1px solid #ddd;
+  width: 278px;
+  max-width: none;
+  padding: 0;
+  margin-top: 7px;
+  top: 100px;
+  left: 20px;
+  z-index: 3001;
+  display: none;
+  font-family: arial;
+  font-size: 15px;
+  line-height: 1em;
+}
+
+.daterangepicker:before, .daterangepicker:after {
+  position: absolute;
+  display: inline-block;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker:before {
+  top: -7px;
+  border-right: 7px solid transparent;
+  border-left: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+}
+
+.daterangepicker:after {
+  top: -6px;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+}
+
+.daterangepicker.opensleft:before {
+  right: 9px;
+}
+
+.daterangepicker.opensleft:after {
+  right: 10px;
+}
+
+.daterangepicker.openscenter:before {
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.daterangepicker.openscenter:after {
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.daterangepicker.opensright:before {
+  left: 9px;
+}
+
+.daterangepicker.opensright:after {
+  left: 10px;
+}
+
+.daterangepicker.drop-up {
+  margin-top: -7px;
+}
+
+.daterangepicker.drop-up:before {
+  top: initial;
+  bottom: -7px;
+  border-bottom: initial;
+  border-top: 7px solid #ccc;
+}
+
+.daterangepicker.drop-up:after {
+  top: initial;
+  bottom: -6px;
+  border-bottom: initial;
+  border-top: 6px solid #fff;
+}
+
+.daterangepicker.single .daterangepicker .ranges, .daterangepicker.single .drp-calendar {
+  float: none;
+}
+
+.daterangepicker.single .drp-selected {
+  display: none;
+}
+
+.daterangepicker.show-calendar .drp-calendar {
+  display: block;
+}
+
+.daterangepicker.show-calendar .drp-buttons {
+  display: block;
+}
+
+.daterangepicker.auto-apply .drp-buttons {
+  display: none;
+}
+
+.daterangepicker .drp-calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker .drp-calendar.left {
+  padding: 8px 0 8px 8px;
+}
+
+.daterangepicker .drp-calendar.right {
+  padding: 8px;
+}
+
+.daterangepicker .drp-calendar.single .calendar-table {
+  border: none;
+}
+
+.daterangepicker .calendar-table .next span, .daterangepicker .calendar-table .prev span {
+  color: #fff;
+  border: solid black;
+  border-width: 0 2px 2px 0;
+  border-radius: 0;
+  display: inline-block;
+  padding: 3px;
+}
+
+.daterangepicker .calendar-table .next span {
+  transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+}
+
+.daterangepicker .calendar-table .prev span {
+  transform: rotate(135deg);
+  -webkit-transform: rotate(135deg);
+}
+
+.daterangepicker .calendar-table th, .daterangepicker .calendar-table td {
+  white-space: nowrap;
+  text-align: center;
+  vertical-align: middle;
+  min-width: 32px;
+  width: 32px;
+  height: 24px;
+  line-height: 24px;
+  font-size: 12px;
+  border-radius: 4px;
+  border: 1px solid transparent;
+  white-space: nowrap;
+  cursor: pointer;
+}
+
+.daterangepicker .calendar-table {
+  border: 1px solid #fff;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.daterangepicker .calendar-table table {
+  width: 100%;
+  margin: 0;
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background-color: #eee;
+  border-color: transparent;
+  color: inherit;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date {
+  background-color: #fff;
+  border-color: transparent;
+  color: #999;
+}
+
+.daterangepicker td.in-range {
+  background-color: #ebf4f8;
+  border-color: transparent;
+  color: #000;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: transparent;
+  color: #fff;
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+  cursor: not-allowed;
+  text-decoration: line-through;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin: 0 auto;
+  background: #eee;
+  border: 1px solid #eee;
+  padding: 2px;
+  outline: 0;
+  font-size: 12px;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 4px auto 0 auto;
+  line-height: 30px;
+  position: relative;
+}
+
+.daterangepicker .calendar-time select.disabled {
+  color: #ccc;
+  cursor: not-allowed;
+}
+
+.daterangepicker .drp-buttons {
+  clear: both;
+  text-align: right;
+  padding: 8px;
+  border-top: 1px solid #ddd;
+  display: none;
+  line-height: 12px;
+  vertical-align: middle;
+}
+
+.daterangepicker .drp-selected {
+  display: inline-block;
+  font-size: 12px;
+  padding-right: 8px;
+}
+
+.daterangepicker .drp-buttons .btn {
+  margin-left: 8px;
+  font-size: 12px;
+  font-weight: bold;
+  padding: 4px 8px;
+}
+
+.daterangepicker.show-ranges.single.rtl .drp-calendar.left {
+  border-right: 1px solid #ddd;
+}
+
+.daterangepicker.show-ranges.single.ltr .drp-calendar.left {
+  border-left: 1px solid #ddd;
+}
+
+.daterangepicker.show-ranges.rtl .drp-calendar.right {
+  border-right: 1px solid #ddd;
+}
+
+.daterangepicker.show-ranges.ltr .drp-calendar.left {
+  border-left: 1px solid #ddd;
+}
+
+.daterangepicker .ranges {
+  float: none;
+  text-align: left;
+  margin: 0;
+}
+
+.daterangepicker.show-calendar .ranges {
+  margin-top: 8px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0 auto;
+  padding: 0;
+  width: 100%;
+}
+
+.daterangepicker .ranges li {
+  font-size: 12px;
+  padding: 8px 12px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li:hover {
+  background-color: #eee;
+}
+
+.daterangepicker .ranges li.active {
+  background-color: #08c;
+  color: #fff;
+}
+
+/*  Larger Screen Styling */
+@media (min-width: 564px) {
+  .daterangepicker {
+    width: auto;
+  }
+
+  .daterangepicker .ranges ul {
+    width: 140px;
+  }
+
+  .daterangepicker.single .ranges ul {
+    width: 100%;
+  }
+
+  .daterangepicker.single .drp-calendar.left {
+    clear: none;
+  }
+
+  .daterangepicker.single .ranges, .daterangepicker.single .drp-calendar {
+    float: left;
+  }
+
+  .daterangepicker {
+    direction: ltr;
+    text-align: left;
+  }
+
+  .daterangepicker .drp-calendar.left {
+    clear: left;
+    margin-right: 0;
+  }
+
+  .daterangepicker .drp-calendar.left .calendar-table {
+    border-right: none;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+
+  .daterangepicker .drp-calendar.right {
+    margin-left: 0;
+  }
+
+  .daterangepicker .drp-calendar.right .calendar-table {
+    border-left: none;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .daterangepicker .drp-calendar.left .calendar-table {
+    padding-right: 8px;
+  }
+
+  .daterangepicker .ranges, .daterangepicker .drp-calendar {
+    float: left;
+  }
+}
+
+@media (min-width: 730px) {
+  .daterangepicker .ranges {
+    width: auto;
+  }
+
+  .daterangepicker .ranges {
+    float: left;
+  }
+
+  .daterangepicker.rtl .ranges {
+    float: right;
+  }
+
+  .daterangepicker .drp-calendar.left {
+    clear: none !important;
+  }
+}