diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index 1c9131eb..6ed4a139 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -88,7 +88,7 @@ function DoRand(jobname) } diff --git a/src/admin/css/base.css b/src/admin/css/base.css index fe2a9e3a..6930249f 100644 --- a/src/admin/css/base.css +++ b/src/admin/css/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{display:inline-block;margin:8px 0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;color:#fff;background:#28a745;border-radius:.2rem;border:0;transition:all .6s}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}textarea{padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}select{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #008E38}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding:10px 0;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left;line-height:30px}.bodytitletxt{padding-left:10px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:22px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn+.btn{margin-left:10px}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{display:inline-block;margin:8px 0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;color:#fff;background:#28a745;border-radius:.2rem;border:0;transition:all .6s}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}textarea{padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}select{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #008E38}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding:10px 0;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left;line-height:30px}.bodytitletxt{padding-left:10px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:22px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn+.btn{margin-left:10px}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/admin/images/dlgtitle.gif b/src/admin/images/dlgtitle.gif index a54ae9f2..5bc47f78 100644 Binary files a/src/admin/images/dlgtitle.gif and b/src/admin/images/dlgtitle.gif differ diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index fd4a4dcb..6cbfa59b 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -145,7 +145,7 @@ if ($rs < 0) { 0) { ?> -
+
$val) { diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 1721074e..6488efea 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -389,7 +389,7 @@ function LoadQuickDiv(e, surl, oname, w, h) { newobj.style.minWidth = "450px"; newobj.style.top = posTop + "px"; newobj.style.left = posLeft + "px"; - newobj.innerHTML = '
Loading...
'; + newobj.innerHTML = '
Loading...
'; newobj.style.display = 'block'; fetch(surl).then(resp=>resp.text()).then((d)=>{ newobj.innerHTML = d; diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index 115e92e7..babd5fba 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -12,7 +12,7 @@
- + diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index 3bddaf11..012267f1 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -80,7 +80,7 @@ td{ padding:2px; padding-left:6px; line-height:150%; } -
 点卡产品分类: 点卡产品分类:
产品名称
+ diff --git a/src/admin/templets/diy_field_edit.htm b/src/admin/templets/diy_field_edit.htm index dd95ef6c..c407a151 100644 --- a/src/admin/templets/diy_field_edit.htm +++ b/src/admin/templets/diy_field_edit.htm @@ -64,7 +64,7 @@ td{ padding:2px; padding-left:6px; } -
 自定义表单管理 > 增加新字段:
+ diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 36e57936..2df6cb63 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -27,7 +27,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
+
 流量统计表
@@ -66,7 +66,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
+
 系统信息
@@ -104,13 +104,13 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
+
 版本授权
正在载入
-
+
@@ -118,7 +118,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ
-
+
 最新文档
正在载入
diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index 152ec1a7..42745aa1 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -103,7 +103,7 @@ td{ padding:2px; padding-left:6px; line-height:150%; }
自定义表单管理 > 修改字段:
-
+ -
diff --git a/src/admin/templets/mynews_add.htm b/src/admin/templets/mynews_add.htm index 2f1dc31d..eb075fea 100644 --- a/src/admin/templets/mynews_add.htm +++ b/src/admin/templets/mynews_add.htm @@ -21,7 +21,7 @@ function checkSubmit()
+ diff --git a/src/admin/templets/mynews_edit.htm b/src/admin/templets/mynews_edit.htm index 3c224938..b2e08186 100644 --- a/src/admin/templets/mynews_edit.htm +++ b/src/admin/templets/mynews_edit.htm @@ -22,7 +22,7 @@ function checkSubmit() - diff --git a/src/admin/templets/sys_passport.htm b/src/admin/templets/sys_passport.htm index b7aa10e5..c5f146a2 100644 --- a/src/admin/templets/sys_passport.htm +++ b/src/admin/templets/sys_passport.htm @@ -8,7 +8,7 @@
站内新闻管理 > 增加消息
+ diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index 12a74e2f..e2b77902 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -190,7 +190,7 @@ li{float:left;padding-right:10px;line-height:26px} 更新所有枚举缓存 - +
站内新闻管理 > 增加消息 灰色字的为系统内置枚举,您是不能对它进行删除修改操作的,但可以添加或修改它的元素灰色字的为系统内置枚举,您是不能对它进行删除修改操作的,但可以添加或修改它的元素
Execute('me', 'Select * From `#@__admin` order by id asc'); while( $arr = $dsql->GetArray('me') ) { - echo "

请稍后,正在载入

\r\n\r\n"; + echo "

请稍后,正在载入

\r\n\r\n"; } ?>
- +
 通行证设置:  通行证设置:
diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm index 201fe78f..82538650 100644 --- a/src/admin/templets/sys_safetest.htm +++ b/src/admin/templets/sys_safetest.htm @@ -52,7 +52,7 @@
diff --git a/src/static/ckeditor/config.js b/src/static/ckeditor/config.js index 8b21bc48..b913681b 100644 --- a/src/static/ckeditor/config.js +++ b/src/static/ckeditor/config.js @@ -18,6 +18,7 @@ CKEDITOR.editorConfig = function (config) { { name: 'colors', groups: ['colors'] }, { name: 'tools', groups: ['tools'] } ]; + config.removePlugins = 'exportpdf'; config.height = 500; config.extraPlugins = 'html5video,dedepagebreak,textindent'; config.removeButtons = 'About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField'; diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 96a8d133..94a1580a 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -158,23 +158,23 @@ class TypeUnit //普通列表 if ($ispart == 0 || empty($ispart)) { $smenu = " oncontextmenu=\"CommonMenu(event,this,$id,'".urlencode($typeName)."')\""; - $timg = " "; + $timg = " "; } //封面频道 else if ($ispart == 1) { $smenu = " oncontextmenu=\"CommonMenuPart(event,this,$id,'".urlencode($typeName)."')\""; - $timg = " "; + $timg = " "; } //独立页面 //else if($ispart==2) //{ - //$timg = " "; + //$timg = " "; //$smenu = " oncontextmenu=\"SingleMenu(event,this,$id,'".urlencode($typeName)."')\" "; //} //跳转网址 else { continue; - $timg = " "; + $timg = " "; $smenu = " oncontextmenu=\"JumpMenu(event,this,$id,'".urlencode($typeName)."')\" "; } echo " \r\n";