diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index afe6b5ad..94e4bc63 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -355,7 +355,7 @@ else if ($dopost == 'moveArchives') { - + @@ -608,7 +608,7 @@ else if ($dopost == 'quickEdit') { - + @@ -884,7 +884,7 @@ else if ($dopost == 'attsDlg') { - + diff --git a/src/admin/content_list.php b/src/admin/content_list.php index 900e76ef..aa84d585 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -149,7 +149,7 @@ ORDER BY $orderbyField DESC"; if (empty($f) || !preg_match("#form#", $f)) $f = 'form1.arcid1'; //初始化 $dlist = new DataListCP(); -$dlist->pageSize = 40; +$dlist->pageSize = 30; //GET参数 $dlist->SetParameter('dopost', 'listArchives'); $dlist->SetParameter('keyword', $keyword); diff --git a/src/admin/css/frame.css b/src/admin/css/frame.css index 5b7a598f..e242b19a 100644 --- a/src/admin/css/frame.css +++ b/src/admin/css/frame.css @@ -1 +1 @@ -*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#393d49;background:#fff;overflow:hidden}body.hidemenu{background:none}a{text-decoration:none}ul{list-style:none}input[type="text"],input[type="password"]{padding:2px 4px;width:140px;height:18px;line-height:18px;font-size:12px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}.top{height:46px;width:100%;background:linear-gradient(45deg,#008e38,#57960f 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}.top .top_logo a{font-size:18px;font-weight:600;color:#fff}.top .top_version{display:inline-block;margin-top:12px;margin-left:10px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;line-height:46px;overflow:hidden}.top .top_link ul li.welcome img{margin-top:-2px;margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.topnav{width:100%;height:30px;line-height:30px;background:#393d49;overflow:hidden;clear:both}.topnav .menuact{float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{padding-right:10px;color:#eee;overflow:hidden}.topnav .menuact a:hover{color:#fff}.sysmsg{padding-right:30px;float:right;color:#999;overflow:hidden}.scroll{float:right;overflow:hidden}.scroll ul li,.sysmsg ul li a{color:#bbb}.scroll a{padding-left:10px;color:#fff}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:99.99%;height:100%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{display:block;padding:0 10px;height:30px;line-height:30px;color:#666}.qucikmenu ul li a:hover{background:#f8f8f8}.pagemask{position:absolute;display:none;width:100%;height:100%;background:#393d49;opacity:.7;z-index:100}.iframemask{position:absolute;display:none;z-index:80;top:0;left:0;width:100%;height:100%;background:#fff;border:none;opacity:0}.allmenu{position:absolute;display:none;margin-left:-400px;padding:10px;width:800px;top:76px;left:50%;background:#fff;border-radius:.2rem;z-index:999}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{margin-left:-1px;padding-right:6px;padding-left:6px;float:left;width:130px;overflow:hidden}.maptop dt.bigitem{padding:6px 10px;line-height:18px;color:#fff;background:#393d49}.mapitem dt{line-height:30px;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../../static/web/img/arrr.gif)0 8px no-repeat}.allmenu a{color:#5C604F}.allmenu a:hover{color:#F63}#login .theme{padding:10px;margin-top:20px;width:70%;clear:both}#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:22px;line-height:22px;color:#393d49;text-align:right}.allsearch{float:left;margin-top:6px;border:1px solid #fff;border-radius:.2rem}.np{margin-top:6px;margin-left:10px;width:40px;height:18px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:0;cursor:pointer} \ No newline at end of file +*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}a{text-decoration:none}ul{list-style:none}input[type="text"],input[type="password"]{padding:2px 4px;width:140px;height:18px;line-height:18px;font-size:12px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}.top{height:46px;width:100%;background:linear-gradient(45deg,#008e38,#57960f 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}.top .top_logo a{font-size:18px;font-weight:600;color:#fff}.top .top_version{display:inline-block;margin-top:12px;margin-left:10px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;line-height:46px;overflow:hidden}.top .top_link ul li.welcome img{margin-top:-2px;margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.topnav{width:100%;height:30px;line-height:30px;background:#424b51;overflow:hidden;clear:both}.topnav .menuact{float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{padding-right:10px;color:#eee;overflow:hidden}.topnav .menuact a:hover{color:#fff}.sysmsg{padding-right:30px;float:right;color:#999;overflow:hidden}.scroll{float:right;overflow:hidden}.scroll ul li,.sysmsg ul li a{color:#bbb}.scroll a{padding-left:10px;color:#fff}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:99.99%;height:100%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{display:block;padding:0 10px;height:30px;line-height:30px;color:#666}.qucikmenu ul li a:hover{background:#f8f8f8}.pagemask{position:absolute;display:none;width:100%;height:100%;background:#424b51;opacity:.7;z-index:100}.iframemask{position:absolute;display:none;z-index:80;top:0;left:0;width:100%;height:100%;background:#fff;border:none;opacity:0}.allmenu{position:absolute;display:none;margin-left:-400px;padding:10px;width:800px;top:76px;left:50%;background:#fff;border-radius:.2rem;z-index:999}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{margin-left:-1px;padding-right:6px;padding-left:6px;float:left;width:130px;overflow:hidden}.maptop dt.bigitem{padding:6px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../../static/web/img/arrr.gif)0 8px no-repeat}.allmenu a{color:#5C604F}.allmenu a:hover{color:#F63}#login .theme{padding:10px;margin-top:20px;width:70%;clear:both}#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:22px;line-height:22px;color:#424b51;text-align:right}.allsearch{float:left;margin-top:6px;border:1px solid #fff;border-radius:.2rem}.np{margin-top:6px;margin-left:10px;width:40px;height:18px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:0;cursor:pointer} \ No newline at end of file diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index c1ec4c82..5a360862 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -13,7 +13,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); 插入多图 - +
- +
单页采集规则管理：
@@ -126,7 +125,6 @@ {/dede:datalist}
-   全选 取消 删除 @@ -134,9 +132,7 @@
- {dede:pagelist listsize=5/} - {dede:pagelist listsize='6'/}
@@ -190,13 +186,12 @@ - - + + + - \ No newline at end of file diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index 7a742973..09c64a39 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -107,9 +107,7 @@ - - {dede:pagelist listsize=3/} - + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/article_keywords_select.htm b/src/admin/templets/article_keywords_select.htm index 56beff64..a038a30f 100644 --- a/src/admin/templets/article_keywords_select.htm +++ b/src/admin/templets/article_keywords_select.htm @@ -70,13 +70,13 @@ function AddNewKw() - + - + {dede:datalist empty='
暂无内容
'} {dede:field.keyword/} {/dede:datalist} @@ -94,9 +94,7 @@ function AddNewKw() - - {dede:pagelist listsize=3/} - + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 76b7719f..6ef5d4d6 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -123,7 +123,7 @@ img{margin-right:0} - {dede:pagelist listsize=5/} + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index 9702c2f5..4c6540f1 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -180,7 +180,7 @@ function noSelAll() { - {dede:pagelist listsize=5/} + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 1b8064f0..edf7adcb 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -86,9 +86,7 @@ - - {dede:pagelist listsize=5/} - + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index a45b6ce6..9e9505e6 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -235,9 +235,7 @@ - +
- {dede:pagelist listsize=3/} - {dede:pagelist listsize='6'/}
diff --git a/src/admin/templets/erradd.htm b/src/admin/templets/erradd.htm index f9f88c7c..2f3c2e99 100644 --- a/src/admin/templets/erradd.htm +++ b/src/admin/templets/erradd.htm @@ -75,8 +75,7 @@ {dede:field.id /} {dede:field.mid function='username(@me)'/} - {dede:field.title /} - + {dede:field.title /} {dede:field.type function='typename(@me)'/} {dede:field.sendtime function='GetDateMk(@me)'/} {dede:field.errtxt /} @@ -91,9 +90,7 @@ - - {dede:pagelist listsize=5/} - + {dede:pagelist listsize='6'/} diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index a4b9935a..f206e1db 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -66,8 +66,7 @@ - +
diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm index 53528a4a..bdf95407 100644 --- a/src/admin/templets/index_menu.htm +++ b/src/admin/templets/index_menu.htm @@ -6,9 +6,7 @@ -var curopenItem = '$openitem';"; -?> +var curopenItem = '$openitem';"; ?> @@ -49,14 +49,11 @@
评论管理
@@ -93,23 +92,15 @@ 		- - + + - - + + {/dede:datalist} - + diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 6e6fa1b8..b5495d65 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -111,9 +111,7 @@ - +
-  选择 - - 用户：{dede:field.username/} - 选择 用户：{dede:field.username/} 文档：{dede:field.arctitle function="RemoveXSS(@me)"/} (浏览) 0) { ?>（{dede:field.replycount/}条回复） - IP地址：{dede:field.ip/} - - 时间：{dede:field.dtime function="GetDateTimeMK(@me)" /} - IP地址：{dede:field.ip/}时间：{dede:field.dtime function="GetDateTimeMK(@me)" /} 编辑评论 更新评论 @@ -132,9 +123,7 @@
- {dede:pagelist listsize='5' /} - {dede:pagelist listsize='6'/}
diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm index 972810ba..96d614c9 100644 --- a/src/admin/templets/freelist_main.htm +++ b/src/admin/templets/freelist_main.htm @@ -109,8 +109,8 @@ - - + +
自由列表管理 增加列表
- {dede:pagelist listsize=6/} - {dede:pagelist listsize='6'/}
@@ -89,9 +86,7 @@ {/dede:datalist} - +
-
- 单独页面管理 -
+
单独页面管理
增加一个页面 -  更新选中页面 -  更新所有页面 -      + 更新选中页面 + 更新所有页面
- {dede:pagelist listsize=6/} - {dede:pagelist listsize='6'/}
diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index 56425f1d..1f78246d 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -78,7 +78,7 @@ $help) { - echo '
关闭
标签名称：'.$key.'
功能说明：'.trim($help[0]).'
使用实例：

参数说明：
'."\r\n"; + echo '
关闭
标签名称：'.$key.'
功能说明：'.trim($help[0]).'
使用实例：

参数说明：
'."\r\n"; $parameters = explode("\n", $help[2]); foreach($parameters as $parameter) { diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 171951f6..7c0158b6 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.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:#393d49;background:#fff}a{color:#393d49;text-decoration:none}a:hover{color:#28a745;text-decoration:none}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}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:#393d49;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:#393d49;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:#393d49;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f6f6f6;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:160px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#fff;text-align:right}.coolbg5{width:160px;height:6px;border-top:1px solid #BDC5B4;background:#fff}.wsselect{height:60px;background:#fff;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #28a745}.pubdlg{background:#fff;border:2px solid #28a745;border-radius:.2rem;z-index:8888}.pubdlg .title{height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:url(/static/web/img/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#393d49}.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:2px solid #28a745;background:#fff;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #28a745;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:6px;background:#fff url(/static/web/img/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.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 #28a745;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(/static/web/img/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(/static/web/img/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(/static/web/img/calendar.gif)10px no-repeat}#title{background:url(/static/web/img/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}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.ctfield{padding:6px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.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}.table{color:#393d49}.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}a{color:#424b51;text-decoration:none}a:hover{color:#28a745;text-decoration:none}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}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}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f6f6f6;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:160px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#fff;text-align:right}.coolbg5{width:160px;height:6px;border-top:1px solid #BDC5B4;background:#fff}.wsselect{height:60px;background:#fff;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #28a745}.pubdlg{background:#fff;border:2px solid #28a745;border-radius:.2rem;z-index:8888}.pubdlg .title{height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:url(/static/web/img/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:2px solid #28a745;background:#fff;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #28a745;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:6px;background:#fff url(/static/web/img/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.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 #28a745;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(/static/web/img/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(/static/web/img/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(/static/web/img/calendar.gif)10px no-repeat}#title{background:url(/static/web/img/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}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.ctfield{padding:6px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.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}.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/system/common.func.php b/src/system/common.func.php index 43475dc8..66c8191d 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -224,7 +224,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) } $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}"; $rmsg = $func; - $rmsg .= "document.write(\"\");"; + $rmsg .= "document.write(\"\");"; $rmsg .= "document.write(\"
"; $rmsg .= "

提示信息

\");"; $rmsg .= "document.write(\"
\");"; diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php index 559d894e..5904ef8a 100755 --- a/src/system/datalistcp.class.php +++ b/src/system/datalistcp.class.php @@ -317,7 +317,7 @@ class DataListCP $plist .= $endpage; } if (preg_match("#form#i", $atts['listitem'])) { - $plist .= "
$hidenform"; + $plist .= " $hidenform"; if ($totalpage > $total_list) { $plist .= "\r\n"; $plist .= "\r\n"; diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php index a4727db7..c663380a 100755 --- a/src/system/libraries/oxwindow.class.php +++ b/src/system/libraries/oxwindow.class.php @@ -125,7 +125,7 @@ class OxWindow $colspan = ""; } $this->myWinItem .= ""; - $this->myWinItem .= "$title"; + $this->myWinItem .= "$title"; $this->myWinItem .= ""; } /** diff --git a/src/theme/plus/car.htm b/src/theme/plus/car.htm index a54102db..0e8c7097 100644 --- a/src/theme/plus/car.htm +++ b/src/theme/plus/car.htm @@ -59,7 +59,7 @@ -
+
共 {dede:var.carts.cart_count/} 件商品,合计: {dede:var.carts.price_count/}元
diff --git a/src/theme/plus/list_diyform.htm b/src/theme/plus/list_diyform.htm index efa4d459..d8dec564 100644 --- a/src/theme/plus/list_diyform.htm +++ b/src/theme/plus/list_diyform.htm @@ -16,16 +16,13 @@
- +
    +
  • +

    name; ?>内容列表

    +
    • +
+ 发布信息 +
@@ -47,9 +44,7 @@ else if($fielddata[1]=='addon') { $fields[$field] = " 其它附件"; - } - else - { + } else { if($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]); else $fields[$field] = dede_htmlspecialchars($fields[$field]); if( strlen($fields[$field]) > 250 ) @@ -66,9 +61,9 @@ ?> {/dede:datalist} - - -
{dede:pagelist listsize=5 /}
+ + +
{dede:pagelist listsize='6'/}
diff --git a/src/theme/system/part_autochannel.htm b/src/theme/system/part_autochannel.htm index add6df58..9fa0fcd7 100644 --- a/src/theme/system/part_autochannel.htm +++ b/src/theme/system/part_autochannel.htm @@ -2,7 +2,7 @@
    • -
  • +
  • [field:typename/]
  • diff --git a/src/theme/templets/advancedsearch.htm b/src/theme/templets/advancedsearch.htm index 1a598b99..1c71a1f6 100644 --- a/src/theme/templets/advancedsearch.htm +++ b/src/theme/templets/advancedsearch.htm @@ -154,9 +154,7 @@ $fields['typeurl'] = GetTypeUrl($fields['typeid'],MfTypedir($fields['typedir']), {/dede:datalist}
    • -
    - {dede:pagelist listsize='5'/} -
    +
    {dede:pagelist listsize='6'/}
    {dede:global.cfg_powerby/} {dede:global.cfg_beian/} Powered by DedeBIZ{dede:global.cfg_version/}
    diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index c89b425f..8e5ebf7f 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -106,7 +106,7 @@ 会员升级: - + diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index 92941acf..a7f04b57 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -57,10 +57,10 @@ 文章标题 - 类目 - 状态 - 点击 - 发布时间 + 类目 + 状态 + 点击 + 发布时间 操作 @@ -93,10 +93,7 @@
    - - +
    diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index dfcf606b..c18a9c68 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -57,23 +57,25 @@ 文章标题 - 类目 - 状态 - 点击 - 发布时间 + 类目 + 状态 + 点击 + 发布时间 操作 {dede:datalist} - ' target='_blank'> + - + =0) echo "已审核"; else if($fields['arcrank']==-2) echo "被退回"; else echo "未审核"; - ?> + ?> + @@ -85,9 +87,7 @@
    - + diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm index eee7fe7b..1e89ba7a 100755 --- a/src/user/templets/mypay.htm +++ b/src/user/templets/mypay.htm @@ -26,13 +26,13 @@
    - - - - - - - + + + + + + + @@ -51,15 +51,16 @@ {/dede:datalist} - - + + + +
    ID标题消费金币消费时间
    ID标题消费金币消费时间
    - -
    + + +
    - + diff --git a/src/user/templets/mystow.htm b/src/user/templets/mystow.htm index e3011e06..558e440e 100755 --- a/src/user/templets/mystow.htm +++ b/src/user/templets/mystow.htm @@ -36,23 +36,19 @@ {dede:datalist} {dede:field.title/} - - [推荐] - - [删除] - - - - 收藏时间: + + [推荐] + [删除] + + 收藏时间: + {/dede:datalist} - + @@ -61,4 +57,4 @@ - + \ No newline at end of file diff --git a/src/user/templets/operation.htm b/src/user/templets/operation.htm index 9437f5db..777b9d52 100755 --- a/src/user/templets/operation.htm +++ b/src/user/templets/operation.htm @@ -52,12 +52,10 @@ - + - + diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm index 5f826b0e..9e7bda57 100755 --- a/src/user/templets/pm-main.htm +++ b/src/user/templets/pm-main.htm @@ -104,16 +104,13 @@ - + -