diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index 2d3ffb05..002c4c02 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -60,8 +60,8 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $sonCats = ''; LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats); if ($sonCats != '') { - if ($row->ispart == 1) $OptionArrayList .= ""; - else if($row->ispart == 2) $OptionArrayList .= ""; + if ($row->ispart == 1) $OptionArrayList .= ""; + else if($row->ispart == 2) $OptionArrayList .= ""; else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; else $OptionArrayList .= ""; $OptionArrayList .= $sonCats; diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index d576b358..95e080b7 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -95,7 +95,7 @@ $typeids = explode(',', $typeid); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 3672b3fb..f5b83d27 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -70,7 +70,7 @@ $dsql->SetQuery(" SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart $dsql->Execute('op'); while ($row = $dsql->GetObject('op')) { $topc = $row->id; - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery(" SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1) "); $dsql->Execute('s'); while ($row = $dsql->GetObject('s')) { diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index 9050e950..a397aa0e 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -98,7 +98,7 @@ $typeids = explode(',', $row['typeid']); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 8b5e26e8..26f40ef3 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -1 +1 @@ -::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:#f2f2f2;border-radius:.2rem}::-webkit-scrollbar-thumb{background:#dee2e6;border-radius:.2rem}*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#fff}a{color:#545b62;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}th,td{line-height:1.5}th,td,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{margin-bottom:0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#545b62;background:#fff;border:1px solid #dee2e6;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=file]{border:0}input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkbox]:focus{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 2px #28a745}textarea{padding:.25rem .5rem;color:#545b62;background:#fff;border:1px solid #dee2e6;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:#545b62;background:#fff;border:1px solid #dee2e6;border-radius:.2rem;transition:all .6s}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f8f8f8;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:26px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;border-bottom:1px solid #dee2e6}#uploadfield{float:left}.bline2{border-bottom:1px solid #dee2e6}.coolbt{background:#E4F7D7;border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;cursor:pointer}.coolbt2{background:#F7FCDA;border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC}.coolbg3{width:140px;height:26px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:390px;height:26px;line-height:26px;background:#E7F3B1;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;text-align:right}.coolbg62{padding:.6rem;width:390px;height:300px;background:#F8FDF0;border:1px solid #BDC5B4}.coolbg4{width:160px;height:30px;line-height:30px;background:#fff;border-bottom:1px solid #C9CFC1;text-align:right}.coolbg5{width:160px;height:6px;background:#fff;border-top:1px solid #BDC5B4}.wsselect{height:60px;background:#fff;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;background:#F0FAEB;border:2px solid #28a745}.pubdlg{background:#fff;border:2px solid #28a745;border-radius:.2rem;z-index:8888}.pubdlg .title{padding-left:10px;height:30px;line-height:30px;font-weight:600;color:#545b62;background:#f8f8f8;border-bottom:1px solid #F8FCF1;text-align:left;cursor:move}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:100%;background:#cdcdcd;opacity:.6;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 solid #dee2e6}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px solid #dee2e6;background:#F8FCF1;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:6px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;border:2px solid #28a745;background:#fff;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;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:26px;border:1px solid #fff}.nbt{padding:.6rem;background:#fff url(../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:.6rem}.tblist td{padding:.6rem;background:#fff}.tblist td.tbsname{padding:.6rem;background:#F9FFE6}.colordlg{padding:.6rem;width:120px;border:2px solid #28a745;background:#FFF;z-index:10005}option.alltype{padding-left:20px;height:18px;line-height:18px;background:url(../img/arr4.gif)6px 6px no-repeat}option.btype{padding-left:20px;height:18px;line-height:18px;background:url(../img/arr4.gif)6px 6px no-repeat}option.stype{padding-left:30px;height:18px;line-height:18px;background:url(../img/arrr.gif)12px 6px no-repeat}.ilist{border:1px dashed #dee2e6}#typeid2{float:left;padding:0;height:26px;background:url(../img/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:26px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:26px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../img/calendar.gif)10px no-repeat}#title{background:url(../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{table-layout:fixed;word-break:break-all}.contents{color:#F7F6F8}.nndiv{width:170px;height:26px;margin:0;padding:0;word-break:break-all;overflow:hidden}.web-info{padding:10px;background:#f8f8f8;border-radius:.2rem;text-align:center}.web-info p{margin-bottom:10px}#text{font-size:0}.maintable{width:98%!important;border:1px solid #dee2e6!important}span.page-link{color:#fff;background:#28a745}a.btn{color:#fff!important}.btn+.btn,.btn-text+.btn-text{margin-left:10px}.fa{font-size:14px!important;color:inherit}.table{margin-bottom:0;color:#545b62}.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 +::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:#f2f2f2;border-radius:.2rem}::-webkit-scrollbar-thumb{background:#dee2e6;border-radius:.2rem}*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#fff}a{color:#545b62;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}th,td{line-height:1.5}th,td,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{margin-bottom:0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#545b62;background:#fff;border:1px solid #dee2e6;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=file]{border:0}input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkbox]:focus{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 2px #28a745}textarea{padding:.25rem .5rem;color:#545b62;background:#fff;border:1px solid #dee2e6;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:#545b62;background:#fff;border:1px solid #dee2e6;border-radius:.2rem;transition:all .6s}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f8f8f8;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:26px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;border-bottom:1px solid #dee2e6}#uploadfield{float:left}.bline2{border-bottom:1px solid #dee2e6}.coolbt{background:#E4F7D7;border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;cursor:pointer}.coolbt2{background:#F7FCDA;border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC}.coolbg3{width:140px;height:26px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:390px;height:26px;line-height:26px;background:#E7F3B1;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;text-align:right}.coolbg62{padding:.6rem;width:390px;height:300px;background:#F8FDF0;border:1px solid #BDC5B4}.coolbg4{width:160px;height:30px;line-height:30px;background:#fff;border-bottom:1px solid #C9CFC1;text-align:right}.coolbg5{width:160px;height:6px;background:#fff;border-top:1px solid #BDC5B4}.wsselect{height:60px;background:#fff;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;background:#F0FAEB;border:2px solid #28a745}.pubdlg{background:#fff;border:2px solid #28a745;border-radius:.2rem;z-index:8888}.pubdlg .title{padding-left:10px;height:30px;line-height:30px;font-weight:600;color:#545b62;background:#f8f8f8;border-bottom:1px solid #F8FCF1;text-align:left;cursor:move}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:100%;background:#cdcdcd;opacity:.6;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 solid #dee2e6}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px solid #dee2e6;background:#F8FCF1;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:6px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;border:2px solid #28a745;background:#fff;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;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:26px;border:1px solid #fff}.nbt{padding:.6rem;background:#fff url(../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:.6rem}.tblist td{padding:.6rem;background:#fff}.tblist td.tbsname{padding:.6rem;background:#F9FFE6}.colordlg{padding:.6rem;width:120px;border:2px solid #28a745;background:#FFF;z-index:10005}option.alltype{padding-left:10px;height:18px;line-height:18px}option.btype{padding-left:20px;height:18px;line-height:18px}option.stype{padding-left:30px;height:18px;line-height:18px}.ilist{border:1px dashed #dee2e6}#typeid2{float:left;padding:0;height:26px;background:url(../img/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:26px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:26px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../img/calendar.gif)10px no-repeat}#title{background:url(../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{table-layout:fixed;word-break:break-all}.contents{color:#F7F6F8}.nndiv{width:170px;height:26px;margin:0;padding:0;word-break:break-all;overflow:hidden}.web-info{padding:10px;background:#f8f8f8;border-radius:.2rem;text-align:center}.web-info p{margin-bottom:10px}#text{font-size:0}.maintable{width:98%!important;border:1px solid #dee2e6!important}span.page-link{color:#fff;background:#28a745}a.btn{color:#fff!important}.btn+.btn,.btn-text+.btn-text{margin-left:10px}.fa{font-size:14px!important;color:inherit}.table{margin-bottom:0;color:#545b62}.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/static/web/img/arrr.gif b/src/static/web/img/arrr.gif deleted file mode 100644 index 0b1f4265..00000000 Binary files a/src/static/web/img/arrr.gif and /dev/null differ