diff --git a/src/dede/css/base.css b/src/dede/css/base.css index 2a01446c..c0db2c15 100644 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -1,67 +1,67 @@ *{font-size:12px;letter-spacing:.4px} -body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5} +body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#ffffff;line-height:1.5} 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} b,strong{font-weight:400} li,dd{margin:0;padding:0;list-style-type:none} -select{height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out} -input[type="button"],input[type="submit"],input[type="reset"]{padding:.25rem .5rem;color:#fff;background-color:#28a745;border-radius:.2rem;border:none;cursor:pointer} -input[type="text"],input[type="password"]{padding:.375rem .75rem;height:calc(1.5em + .75rem + 2px);font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;line-height:18px;vertical-align:middle} -input[type="text"]:focus,input[type="password"]:focus{border-color:#28a745;color:#333;-moz-box-shadow:0 0 3px #28a745;-webkit-box-shadow:0 0 3px #28a745;box-shadow:0 0 3px #28a745;outline:none} -input:disabled,input[readonly]{background-color:#e9ecef;opacity:1} +select{height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;color:#495057;background:#ffffff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out} +input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;line-height:1.5;color:#ffffff;background:#28a745;border-radius:.2rem;border:none;cursor:pointer} +input[type=text],input[type=password]{padding:.375rem .75rem;height:calc(1.5em + .75rem + 2px);font-size:1rem;font-weight:400;color:#495057;background:#ffffff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;line-height:18px;vertical-align:middle} +input[type=text]:focus,input[type="password"]:focus{border-color:#28a745;color:#333333;-moz-box-shadow:0 0 2px #28a745;-webkit-box-shadow:0 0 2px #28a745;box-shadow:0 0 2px #28a745;outline:none} +input:disabled,input[readonly]{background:#e9ecef;opacity:1} label{display:inline-block;margin:.5rem 0} .alltxt{padding:.25rem .5rem;line-height:18px;vertical-align:middle;border-width:1px;border-style:solid;border-color:#707070 #CECECE #CECECE #707070} -textarea{padding:.25rem .5rem;font-size:1rem;font-weight:400;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;vertical-align:middle;line-height:16px;overflow:auto;resize:vertical} -textarea:focus{border-color:#28a745;color:#333;-moz-box-shadow:0 0 3px #28a745;-webkit-box-shadow:0 0 3px #28a745;box-shadow:0 0 3px #28a745} +textarea{padding:.25rem .5rem;font-size:1rem;font-weight:400;color:#495057;background:#ffffff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;vertical-align:middle;line-height:16px;overflow:auto;resize:vertical} +textarea:focus{border-color:#28a745;color:#333333;-moz-box-shadow:0 0 2px #28a745;-webkit-box-shadow:0 0 2px #28a745;box-shadow:0 0 2px #28a745} img{margin-right:6px;vertical-align:baseline} h1,h2,h3{font-size:18px;color:#424b51} a:link{color:#424b51;text-decoration:none} a:hover{opacity:.8} -a:visited{color:#666} -.pubinputs{padding:.25rem .5rem;width:250px;height:16px;line-height:16px;border-width:1px;border-style:solid;border-color:#999 #ddd #ddd #999} -.iptxt{padding:.25rem .5rem;height:14px;line-height:14px;border-width:1px;border-style:solid;border-color:#999 #ddd #ddd #999} +a:visited{color:#666666} +.pubinputs{padding:.25rem .5rem;width:250px;height:16px;line-height:16px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999} +.iptxt{padding:.25rem .5rem;height:14px;line-height:14px;border-width:1px;border-style:solid;border-color:#999999 #dddddd #dddddd #999999} .pubinput{padding-top:6px;padding-bottom:0;height:24px;width:250px} .pubinputl{padding-top:6px;padding-bottom:0;height:24px;width:350px} .np{border:none} .linerow{border-bottom:1px solid #ACACAC} -.coolbg{padding:.25rem .5rem;border:none;border-right:1px solid #ccc;border-bottom:1px solid #ccc;background:#f2f2f2;cursor:pointer} -.coolbg2{border:1px solid #000;background-color:#DFDDD2;height:18px} -.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6} -.bline{height:36px;background-color:#fff} +.coolbg{padding:.25rem .5rem;border:none;border-right:1px solid #cccccc;border-bottom:1px solid #cccccc;background:#f2f2f2;border-radius:.2rem;cursor:pointer} +.coolbg2{border:1px solid #000000;background:#DFDDD2;height:18px} +.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6} +.bline{height:36px;background:#ffffff;border-bottom: 1px solid #eeeeee;} #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{width:140px;height:20px;border:1px solid #BDC5B4;background-color:#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-color:#E7F3B1;text-align:right} -.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background-color:#F8FDF0} -.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background-color:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;text-align:right} -.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background-color:#F9FCDC} -.wsselect{height:60px;line-height:24px overflow-y:auto;background-color:#FCFEF1;overflow:auto} -.dlg{padding:.25rem .5rem;border:2px solid #008E38;background-color:#F0FAEB;width:360px;line-height:160%} -.pubdlg{z-index:8888;border:4px solid #008E38;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} +.bline2{border-bottom:1px solid #eeeeee} +.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-right:1px solid #ACACAC;border-bottom:1px solid #ACACAC;background:#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:#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:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC;background:url(../images/dlgtitle.gif) repeat-x;text-align:right} +.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC} +.wsselect{height:60px;line-height:24px overflow-y:auto;background:#FCFEF1;overflow:auto} +.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%} +.pubdlg{z-index:8888;border:4px solid #008E38;background:#ffffff} +.pubdlg .title{border-bottom:1px solid #C9CFC1;background:#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:0} .fullpagediv{position:absolute;width:100%;height:120%;top:0;left:0;background:#cdcdcd;filter:Alpha(opacity=50);-moz-opacity:.5;opacity:.5;z-index:1999} .quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005} .quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D} .quickselItem{margin-bottom:8px} -.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both} +.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #cccccc;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-color:#F0FAEB;z-index:10001} +.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-color:#F0FAEB} +.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-color:#DCECA6} -.option2{background-color:#F7FBD2} -.option3{background-color:#fff} -.ininput{width:96%;height:20px;border:1px solid #fff} -.nbt{padding:2px;background-image:url(../images/allbtbg.gif);background-color:#fff;border:1px solid #A5AF83} +.option1{background:#DCECA6} +.option2{background:#F7FBD2} +.option3{background:#ffffff} +.ininput{width:96%;height:20px;border:1px solid #ffffff} +.nbt{padding:2px;background-image:url(../images/allbtbg.gif);background:#ffffff;border:1px solid #A5AF83} .tdt{padding-left:6px} .waitpage{position:absolute;top:0;left:0;filter:Alpha(opacity=70);-moz-opacity:.7;background:url(../../images/loading1.gif) #ababab center no-repeat;z-index:10000} .divpre img{max-width:150px;max-height:100px} @@ -71,25 +71,25 @@ a:visited{color:#666} .bodytitle div{float:left} .bodytitletxt{padding-left:6px;line-height:28px} .tbtitle td{padding:6px} -.tblist td{padding:6px;background:#fff} +.tblist td{padding:6px;background:#ffffff} .tblist td.tbsname{padding:6px;background:#F9FFE6} -.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background-color:#F0FAEB;z-index:10005} +.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;font-size:12px;background:url(../images/arr4.gif) 3px 4px no-repeat} option.btype{padding-left:16px;height:18px;line-height:18px;font-size:12px;background:url(../images/arr4.gif) 3px 4px no-repeat} option.stype{padding-left:24px;font-size:12px;height:18px;line-height:18px;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} +.ilist{border-top:1px dashed #eeeeee;border-bottom:1px dashed #eeeeee;border-left:1px dashed #eeeeee} +.ilist td{border-right:1px dashed #eeeeee} #typeid2{float:left;font-size:12px;padding:0;height:18px;background:url(../images/typeid2bg.gif) no-repeat;border:0} -.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer} #litpic{margin-left:-20px;width:85px;height:20px;filter:alpha(opacity=00);-moz-opacity:.0;opacity:.0;cursor:pointer} +.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer} #starttime,#endtime,#pubdate{padding-left:20px;background:url(../images/calendar.gif) 3px 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:#ffffff;background:#28a745} a.btn{color:white!important} -span.page-link{color:#fff;background-color:#28a745} -.btn-success{background-color:#28a745;border-color:#28a745} -.table td,.table th{padding:.65rem} +.btn-success{background:#28a745;border-color:#28a745} +.table td,.table th{padding:.60rem;vertical-align:middle} .table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/dede/css/codemirror.css b/src/dede/css/codemirror.css index f48349ed..1f3b403c 100644 --- a/src/dede/css/codemirror.css +++ b/src/dede/css/codemirror.css @@ -1,382 +1,97 @@ -.CodeMirror { - font-family:monospace; - height:460px; - color:black -} -.CodeMirror-lines { - padding:4px 0 -} -.CodeMirror pre { - padding:0 4px -} -.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler { - background-color:white -} -.CodeMirror-gutters { - border-right:1px solid #ddd; - background-color:#f7f7f7; - white-space:nowrap -} -.CodeMirror-linenumber { - padding:0 3px 0 5px; - min-width:20px; - text-align:right; - color:#999; - white-space:nowrap -} -.CodeMirror-guttermarker { - color:black -} -.CodeMirror-guttermarker-subtle { - color:#999 -} -.CodeMirror-cursor { - border-left:1px solid black; - border-right:none; - width:0 -} -.CodeMirror div.CodeMirror-secondarycursor { - border-left:1px solid silver -} -.cm-fat-cursor .CodeMirror-cursor { - width:auto; - border:0 !important; - background:#7e7 -} -.cm-fat-cursor div.CodeMirror-cursors { - z-index:1 -} -.cm-animate-fat-cursor { - width:auto; - border:0; - -webkit-animation:blink 1.06s steps(1) infinite; - -moz-animation:blink 1.06s steps(1) infinite; - animation:blink 1.06s steps(1) infinite; - background-color:#7e7 -} -@-moz-keyframes blink { - 0% { - }50% { - background-color:transparent -} -100% { - } -} -@-webkit-keyframes blink { - 0% { - }50% { - background-color:transparent -} -100% { - } -} -@keyframes blink { - 0% { - }50% { - background-color:transparent -} -100% { - } -} -.CodeMirror-overwrite .CodeMirror-cursor { - }.cm-tab { - display:inline-block; - text-decoration:inherit -} -.CodeMirror-rulers { - position:absolute; - left:0; - right:0; - top:-50px; - bottom:-20px; - overflow:hidden -} -.CodeMirror-ruler { - border-left:1px solid #ccc; - top:0; - bottom:0; - position:absolute -} -.cm-s-default .cm-header { - color:blue -} -.cm-s-default .cm-quote { - color:#090 -} -.cm-negative { - color:#d44 -} -.cm-positive { - color:#292 -} -.cm-header,.cm-strong { - font-weight:bold -} -.cm-em { - font-style:italic -} -.cm-link { - text-decoration:underline -} -.cm-strikethrough { - text-decoration:line-through -} -.cm-s-default .cm-keyword { - color:#708 -} -.cm-s-default .cm-atom { - color:#219 -} -.cm-s-default .cm-number { - color:#164 -} -.cm-s-default .cm-def { - color:#00f -} -.cm-s-default .cm-variable,.cm-s-default .cm-punctuation,.cm-s-default .cm-property,.cm-s-default .cm-operator { - }.cm-s-default .cm-variable-2 { - color:#05a -} -.cm-s-default .cm-variable-3 { - color:#085 -} -.cm-s-default .cm-comment { - color:#a50 -} -.cm-s-default .cm-string { - color:#a11 -} -.cm-s-default .cm-string-2 { - color:#f50 -} -.cm-s-default .cm-meta { - color:#555 -} -.cm-s-default .cm-qualifier { - color:#555 -} -.cm-s-default .cm-builtin { - color:#30a -} -.cm-s-default .cm-bracket { - color:#997 -} -.cm-s-default .cm-tag { - color:#170 -} -.cm-s-default .cm-attribute { - color:#00c -} -.cm-s-default .cm-hr { - color:#999 -} -.cm-s-default .cm-link { - color:#00c -} -.cm-s-default .cm-error { - color:#f00 -} -.cm-invalidchar { - color:#f00 -} -.CodeMirror-composing { - border-bottom:2px solid -} -div.CodeMirror span.CodeMirror-matchingbracket { - color:#0f0 -} -div.CodeMirror span.CodeMirror-nonmatchingbracket { - color:#f22 -} -.CodeMirror-matchingtag { - background:rgba(255,150,0,.3) -} -.CodeMirror-activeline-background { - background:#e8f2ff -} -.CodeMirror { - position:relative; - overflow:hidden; - background:white -} -.CodeMirror-scroll { - overflow:scroll !important; - margin-bottom:-30px; - margin-right:-30px; - padding-bottom:30px; - height:100%; - outline:none; - position:relative -} -.CodeMirror-sizer { - position:relative; - border-right:30px solid transparent -} -.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler { - position:absolute; - z-index:6; - display:none -} -.CodeMirror-vscrollbar { - right:0; - top:0; - overflow-x:hidden; - overflow-y:scroll -} -.CodeMirror-hscrollbar { - bottom:0; - left:0; - overflow-y:hidden; - overflow-x:scroll -} -.CodeMirror-scrollbar-filler { - right:0; - bottom:0 -} -.CodeMirror-gutter-filler { - left:0; - bottom:0 -} -.CodeMirror-gutters { - position:absolute; - left:0; - top:0; - min-height:100%; - z-index:3 -} -.CodeMirror-gutter { - white-space:normal; - height:100%; - display:inline-block; - vertical-align:top; - margin-bottom:-30px -} -.CodeMirror-gutter-wrapper { - position:absolute; - z-index:4; - background:none !important; - border:none !important -} -.CodeMirror-gutter-background { - position:absolute; - top:0; - bottom:0; - z-index:4 -} -.CodeMirror-gutter-elt { - position:absolute; - cursor:default; - z-index:4 -} -.CodeMirror-gutter-wrapper { - -webkit-user-select:none; - -moz-user-select:none; - user-select:none -} -.CodeMirror-lines { - cursor:text; - min-height:1px -} -.CodeMirror pre { - -moz-border-radius:0; - -webkit-border-radius:0; - border-radius:0; - border-width:0; - background:transparent; - font-family:inherit; - font-size:inherit; - margin:0; - white-space:pre; - word-wrap:normal; - line-height:inherit; - color:inherit; - z-index:2; - position:relative; - overflow:visible; - -webkit-tap-highlight-color:transparent; - -webkit-font-variant-ligatures:contextual; - font-variant-ligatures:contextual -} -.CodeMirror-wrap pre { - word-wrap:break-word; - white-space:pre-wrap; - word-break:normal -} -.CodeMirror-linebackground { - position:absolute; - left:0; - right:0; - top:0; - bottom:0; - z-index:0 -} -.CodeMirror-linewidget { - position:relative; - z-index:2; - overflow:auto -} -.CodeMirror-widget { - }.CodeMirror-code { - outline:none -} -.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber { - -moz-box-sizing:content-box; - box-sizing:content-box -} -.CodeMirror-measure { - position:absolute; - width:100%; - height:0; - overflow:hidden; - visibility:hidden -} -.CodeMirror-cursor { - position:absolute; - pointer-events:none -} -.CodeMirror-measure pre { - position:static -} -div.CodeMirror-cursors { - visibility:hidden; - position:relative; - z-index:3 -} -div.CodeMirror-dragcursors { - visibility:visible -} -.CodeMirror-focused div.CodeMirror-cursors { - visibility:visible -} -.CodeMirror-selected { - background:#d9d9d9 -} -.CodeMirror-focused .CodeMirror-selected { - background:#d7d4f0 -} -.CodeMirror-crosshair { - cursor:crosshair -} -.CodeMirror-line::selection,.CodeMirror-line > span::selection,.CodeMirror-line > span > span::selection { - background:#d7d4f0 -} -.CodeMirror-line::-moz-selection,.CodeMirror-line > span::-moz-selection,.CodeMirror-line > span > span::-moz-selection { - background:#d7d4f0 -} -.cm-searching { - background:#ffa; - background:rgba(255,255,0,.4) -} -.cm-force-border { - padding-right:.1px -} -@media print { - .CodeMirror div.CodeMirror-cursors { - visibility:hidden -} -}.cm-tab-wrap-hack:after { - content:'' -} -span.CodeMirror-selectedtext { - background:none -} \ No newline at end of file +.CodeMirror{font-family:monospace;height:450px;color:black} +.CodeMirror-lines{padding:4px 0} +.CodeMirror pre{padding:0 4px} +.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background:white} +.CodeMirror-gutters{border-right:1px solid #dddddd;background:#f7f7f7;white-space:nowrap} +.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999999;white-space:nowrap} +.CodeMirror-guttermarker{color:black} +.CodeMirror-guttermarker-subtle{color:#999999} +.CodeMirror-cursor{border-left:1px solid black;border-right:none;width:0} +.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver} +.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0 !important;background:#7e7} +.cm-fat-cursor div.CodeMirror-cursors{z-index:1} +.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background:#7e7} +@-moz-keyframes blink{0%{} +50%{background:transparent} +100%{} +}@-webkit-keyframes blink{0%{} +50%{background:transparent} +100%{} +}@keyframes blink{0%{} +50%{background:transparent} +100%{} +}.CodeMirror-overwrite .CodeMirror-cursor{} +.cm-tab{display:inline-block;text-decoration:inherit} +.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden} +.CodeMirror-ruler{border-left:1px solid #cccccc;top:0;bottom:0;position:absolute} +.cm-s-default .cm-header{color:blue} +.cm-s-default .cm-quote{color:#090} +.cm-negative{color:#d44} +.cm-positive{color:#292} +.cm-header,.cm-strong{font-weight:bold} +.cm-em{font-style:italic} +.cm-link{text-decoration:underline} +.cm-strikethrough{text-decoration:line-through} +.cm-s-default .cm-keyword{color:#708} +.cm-s-default .cm-atom{color:#219} +.cm-s-default .cm-number{color:#164} +.cm-s-default .cm-def{color:#00f} +.cm-s-default .cm-variable,.cm-s-default .cm-punctuation,.cm-s-default .cm-property,.cm-s-default .cm-operator{} +.cm-s-default .cm-variable-2{color:#05a} +.cm-s-default .cm-variable-3{color:#085} +.cm-s-default .cm-comment{color:#a50} +.cm-s-default .cm-string{color:#a11} +.cm-s-default .cm-string-2{color:#f50} +.cm-s-default .cm-meta{color:#555} +.cm-s-default .cm-qualifier{color:#555} +.cm-s-default .cm-builtin{color:#30a} +.cm-s-default .cm-bracket{color:#997} +.cm-s-default .cm-tag{color:#170} +.cm-s-default .cm-attribute{color:#00c} +.cm-s-default .cm-hr{color:#999999} +.cm-s-default .cm-link{color:#00c} +.cm-s-default .cm-error{color:#f00} +.cm-invalidchar{color:#f00} +.CodeMirror-composing{border-bottom:2px solid} +div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0} +div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22} +.CodeMirror-matchingtag{background:rgba(255,150,0,.3)} +.CodeMirror-activeline-background{background:#e8f2ff} +.CodeMirror{position:relative;overflow:hidden;background:white} +.CodeMirror-scroll{overflow:scroll !important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:none;position:relative} +.CodeMirror-sizer{position:relative;border-right:30px solid transparent} +.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none} +.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll} +.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll} +.CodeMirror-scrollbar-filler{right:0;bottom:0} +.CodeMirror-gutter-filler{left:0;bottom:0} +.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3} +.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px} +.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none !important;border:none !important} +.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4} +.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4} +.CodeMirror-gutter-wrapper{-webkit-user-select:none;-moz-user-select:none;user-select:none} +.CodeMirror-lines{cursor:text;min-height:1px} +.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual} +.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal} +.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0} +.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto} +.CodeMirror-widget{} +.CodeMirror-code{outline:none} +.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box} +.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden} +.CodeMirror-cursor{position:absolute;pointer-events:none} +.CodeMirror-measure pre{position:static} +div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3} +div.CodeMirror-dragcursors{visibility:visible} +.CodeMirror-focused div.CodeMirror-cursors{visibility:visible} +.CodeMirror-selected{background:#d9d9d9} +.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0} +.CodeMirror-crosshair{cursor:crosshair} +.CodeMirror-line::selection,.CodeMirror-line > span::selection,.CodeMirror-line > span > span::selection{background:#d7d4f0} +.CodeMirror-line::-moz-selection,.CodeMirror-line > span::-moz-selection,.CodeMirror-line > span > span::-moz-selection{background:#d7d4f0} +.cm-searching{background:#ffa;background:rgba(255,255,0,.4)} +.cm-force-border{padding-right:.1px} +@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden} +}.cm-tab-wrap-hack:after{content:''} +span.CodeMirror-selectedtext{background:none} \ No newline at end of file diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css index dc831ffb..e11d8629 100644 --- a/src/dede/css/frame.css +++ b/src/dede/css/frame.css @@ -9,35 +9,35 @@ form{margin:0;padding:0} .head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative} .top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 100%);overflow:hidden;clear:both} .top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px} -.top .top_logo a{font-size:20px;font-weight:600;color:#fff} -.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#fff} +.top .top_logo a{font-size:20px;font-weight:600;color:#ffffff} +.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#ffffff} .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:-4px;margin-right:10px;width:30px;height:30px;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} +.top .top_link ul li{float:left;color:#ffffff} +.top .top_link ul li a{color:#ffffff;padding-left:20px} +.top .top_link ul li a:hover{color:#cccccc} .top .top_link .quick{padding:3px 0px 0px 0px;float:left} .top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden} .top .top_link .quick a.ac_qucikmenu{width:81px;background:url(../images/quick_bg.gif) left top no-repeat;letter-spacing:1px;text-indent:8px} .top .top_link .quick a.ac_qucikmenu:hover{background:url(../images/quick_bg.gif) left bottom no-repeat} .top .top_link .quick a.ac_qucikadd{width:19px;background:url(../images/quick_bg.gif) right top no-repeat} .top .top_link .quick a.ac_qucikadd:hover{background:url(../images/quick_bg.gif) right bottom no-repeat} -.topnav{width:100%;height:30px;background:#333;overflow:hidden;clear:both} +.topnav{width:100%;height:30px;background:#333333;overflow:hidden;clear:both} .topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden;padding-top:6px} -.topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px} -.topnav .menuact a:hover{color:#fff} -.nav{float:left;padding-left:2px;line-height:26px;color:#999} +.topnav .menuact a{overflow:hidden;color:#eeeeee;padding-right:10px} +.topnav .menuact a:hover{color:#ffffff} +.nav{float:left;padding-left:2px;line-height:26px;color:#999999} .nav ul li{float:left;display:block;margin-left:4px} .nav ul li a{padding:0 10px 0px 10px;color:#FFCC00} -.nav ul li a:hover{color:#fff} -.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px} -.sysmsg{height:30px;overflow:hidden;line-height:30px;padding-right:30px;float:right;color:#999;width:500px} +.nav ul li a:hover{color:#ffffff} +.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#ffffff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px} +.sysmsg{height:30px;overflow:hidden;line-height:30px;padding-right:30px;float:right;color:#999999;width:500px} .scroll{float:right;overflow:hidden;height:30px} -.scroll ul li,.sysmsg ul li a{color:#bbb} +.scroll ul li,.sysmsg ul li a{color:#bbbbbb} .scroll ul li{height:26px;overflow:hidden;line-height:26px;float:right;clear:both;padding-left:20px;background:url(../images/ico-sysmsg.png) 5px 8px no-repeat} .scroll ul li a:hover{text-decoration:underline} -.scroll a{padding-left:10px;color:#fff} +.scroll a{padding-left:10px;color:#ffffff} body.showmenu .left{display:block} body.hidemenu .left{display:none} body.showmenu .right{left:220px} @@ -50,16 +50,16 @@ body.hidemenu .right{left:0} .main{height:100%} .main iframe{height:100%;width:99.99%;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{width:110px;list-style:none;border:1px solid #E7E7E7;background:#ffffff} .qucikmenu ul li{display:block;text-align:left} -.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px} +.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666666;padding-left:10px;padding-right:10px} .qucikmenu ul li a:hover{background:#F7F7F7} -.pagemask{width:100%;height:100%;background:#000;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none} -.iframemask{position:absolute;z-index:80;top:0;left:0;background-color:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none} -.allmenu{width:800px;background:#fff;z-index:999;position:absolute;left:50%;top:76px;margin-left:-400px;display:none;padding:10px} +.pagemask{width:100%;height:100%;background:#000000;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none} +.iframemask{position:absolute;z-index:80;top:0;left:0;background:#ffffff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none} +.allmenu{width:800px;background:#ffffff;z-index:999;position:absolute;left:50%;top:76px;margin-left:-400px;display:none;padding:10px} .allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px} .maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px} -.maptop dt.bigitem{padding:5px 10px;background:#333;color:#fff;line-height:18px;font-weight:600} +.maptop dt.bigitem{padding:5px 10px;background:#333333;color:#ffffff;line-height:18px;font-weight:600} .mapitem dt{line-height:21px;font-weight:bold;text-indent:10px;background:#EFF1F1} .mapitem ul{margin-top:10px;margin-bottom:10px} .mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif) 4px 6px no-repeat} @@ -67,12 +67,12 @@ body.hidemenu .right{left:0} .allmenu a:hover{color:#F63} #login .theme{clear:both;padding:10px;width:70%;margin-top:20px} #login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden} -#login .theme span{color:#000;width:150px;display:inline-block;float:left;text-align:right;height:22px;line-height:22px} -input[type="text"],input[type="password"]{width:140px;border-width:1px;border-style:solid;border-color:#fff;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;background:#fff} -input[type="text"]:focus,input[type="password"]:focus{border-color:#6FB1DF;color:#333;-moz-box-shadow:0 0 3px #A5C760;-webkit-border-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760} -* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif) 0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px} +#login .theme span{color:#000000;width:150px;display:inline-block;float:left;text-align:right;height:22px;line-height:22px} +input[type="text"],input[type="password"]{width:140px;border-width:1px;border-style:solid;border-color:#ffffff;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;background:#ffffff} +input[type="text"]:focus,input[type="password"]:focus{border-color:#6FB1DF;color:#333333;-moz-box-shadow:0 0 3px #A5C760;-webkit-border-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760} +* html input.text{width:220px;border:1px solid #a7a6aa;background:#ffffff url(../images/input.gif) 0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px} * html input.radio{margin:-1px 0 0 -2px} -.allsearch{float:left;margin-top:7px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem} -.np{margin-left:10px;width:40px;height:18px;line-height:18px;font-size:12px;color:#fff;cursor:pointer;background:#57960f;border:none;border-radius:.2rem} +.allsearch{float:left;margin-top:7px!important;font-size:12px;border:1px solid #ffffff;border-radius:.2rem} +.np{margin-left:10px;width:40px;height:18px;line-height:18px;font-size:12px;color:#ffffff;cursor:pointer;background:#57960f;border:none;border-radius:.2rem} #help{background:url(../images/dlgtitle.gif) repeat-x scroll 0 0 transparent;bottom:0;left:0;position:absolute;width:100%;height:28px;border-top:1px solid #390;line-height:28px;text-align:right;padding-top:0;padding-bottom:0} #help #content{padding-right:12px;background:url(../images/gtk-edit.png) no-repeat scroll 0px -1px;padding-left:20px} \ No newline at end of file diff --git a/src/dede/css/indexbody.css b/src/dede/css/indexbody.css index b2b0c365..ba6bac82 100755 --- a/src/dede/css/indexbody.css +++ b/src/dede/css/indexbody.css @@ -1,166 +1 @@ -td { - padding:3px 0px 0 3px -} -.title { - color:#666600; - font-weight:bold -} -.title span { - padding-left:3px -} -#addTab { - position:absolute; - left:455px; - top:150px; - width:360px; - height:200px; - z-index:2; - background-color:#FFFFFF; - border:1px solid #889D8F; - padding:0px; - display:none; - overflow:hidden -} -#editTab { - position:absolute; - left:455px; - top:120px; - width:360px; - height:350px; - z-index:1; - background-color:#FFFFFF; - border:1px solid #889D8F; - padding:0px; - display:none -} -.txt { - float:left -} -.updatedvt { - line-height:23px; - padding-left:3px; - width:98%; - border-bottom:1px dashed #dcdcdc -} -.upinfotitle { - border-bottom:1px solid #cccccc; - color:red; - font-weight:bold; - line-height:26px -} -.verline { - border-bottom:1px dashed #cccccc; - line-height:26px -} -.itemTable { - margin-top:8px; - background:#CBD8AC -} -#loaddiv { - top:0; - left:0; - background:#cccccc; - filter:Alpha(opacity=70); - -moz-opacity:0.7; - position:absolute; - z-index:10000; - width:100%; - height:100% -} -#mainmsg { - padding-right:8px -} -.rightside { - width:49%; - float:left; - margin-right:1%; - height:670px -} -.column { - width:49%; - float:left; - margin-right:0.5% -} -.placeholder { - width:98%; - margin-left:1%; - background:#f0f0f0; - border:1px dashed #ddd -} -.dbox { - border:1px solid #DEEAB6; - width:98%; - margin-left:1%; - margin-top:8px -} -.dbox dt { - height:28px; - line-height:28px; - font-weight:bold; - color:#4D6C2F; - cursor:move -} -.dbox dt .l { - float:left; - padding-left:8px -} -.dbox dt .r { - float:right; - padding-right:8px -} -.dbox dt.lside { - border-bottom:1px solid #CFD7C4; - background-color:rgb(239,248,229) -} -.dbox dt.rside { - border-bottom:1px solid #DEEAB6; - background:url(../images/wbg.gif) repeat-x -} -.dbox dd { - padding:0px -} -.dbox dd.intable { - padding-top:3px -} -#updatetest { - padding:6px; - padding-left:110px; - background:url(../images/ico_spider.gif) no-repeat scroll 10px 15px transparent -} -#quickmenu { - width:100%; - height:46px; - overflow:hidden -} -#quickmenu .icoitem { - float:left; - height:24px; - line-height:24px; - margin-top:12px; - padding-left:30px; - overflow:hidden -} -.dboxtable td.nline { - border-bottom:1px dashed #CFD7C4; - height:26px -} -.dboxtable1 ul li { - float:left; - border-bottom:1px dashed #CFD7C4; - height:26px; - line-height:26px; - display:inline; - width:48%; - text-align:center -} -.biz p { - padding:0 15px; - line-height:23px -} -.biz img { - float:right; - margin:40px 15px 0 15px -} -.footer { - line-height:36px -} \ No newline at end of file +.title{color:#666600;font-weight:bold}.title span{padding-left:3px}#addTab{position:absolute;left:455px;top:150px;width:360px;height:200px;z-index:2;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none;overflow:hidden}#editTab{position:absolute;left:455px;top:120px;width:360px;height:350px;z-index:1;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #cccccc;color:red;font-weight:bold}.verline{border-bottom:1px dashed #cccccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#cccccc;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background-color:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../images/wbg.gif) repeat-x}.dbox dd{padding:0px}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../images/ico_spider.gif) no-repeat scroll 10px 15px transparent}#quickmenu{width:100%;height:46px;overflow:hidden}#quickmenu .icoitem{float:left;height:24px;line-height:24px;margin-top:10px;padding-left:30px;overflow:hidden}.dboxtable td.nline{border-bottom:1px dashed #CFD7C4;height:26px}.dboxtable1 ul li{float:left;border-bottom:1px dashed #CFD7C4;height:26px;line-height:26px;display:inline;width:48%;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px} \ No newline at end of file diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php index b1d5c949..c8166d69 100644 --- a/src/dede/dialog/select_images.php +++ b/src/dede/dialog/select_images.php @@ -55,10 +55,10 @@ if (!empty($noeditor)) { diff --git a/src/dede/dialog/select_soft.php b/src/dede/dialog/select_soft.php index e5d98a10..8af04d74 100644 --- a/src/dede/dialog/select_soft.php +++ b/src/dede/dialog/select_soft.php @@ -48,10 +48,10 @@ if (!empty($noeditor)) { @@ -128,7 +128,7 @@ table{background:#fff} \r\n"; echo $line; } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 + if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = "\n $file @@ -168,7 +168,7 @@ table{background:#fff} - 请点击要选择的文件,红色字样的为刚上传的文件 + 点击选择的文件,红色字样的为刚上传的文件 diff --git a/src/dede/dialog/select_templets.php b/src/dede/dialog/select_templets.php index 0f7df7bb..71f4c1a1 100644 --- a/src/dede/dialog/select_templets.php +++ b/src/dede/dialog/select_templets.php @@ -40,10 +40,10 @@ if (empty($comeback)) { @@ -183,7 +183,7 @@ table{background:#fff} - +
diff --git a/src/dede/login.php b/src/dede/login.php index d07c746b..9cbd3c2e 100755 --- a/src/dede/login.php +++ b/src/dede/login.php @@ -1,5 +1,4 @@ 您的管理目录的名称中包含默认名称dede,建议在FTP里把它修改为其它名称,那样会更安全!'; + $redmsg = ''; } else { $redmsg = ''; } - //登录检测 $admindirs = explode('/', str_replace("\\", '/', dirname(__FILE__))); $admindir = $admindirs[count($admindirs) - 1]; @@ -57,44 +51,40 @@ if ($dopost == 'login') { $svali = strtolower(GetCkVdValue()); if (($validate == '' || $validate != $svali) && preg_match("/6/", $safe_gdopen)) { ResetVdValue(); - ShowMsg('验证码不正确!', 'login.php', 0, 1000); + ShowMsg('验证码不正确', 'login.php', 0, 1000); exit; } else { $cuserLogin = new userLogin($admindir); if (!empty($userid) && !empty($pwd)) { $res = $cuserLogin->checkUser($userid, $pwd); - //success if ($res == 1) { $cuserLogin->keepUser(); if (!empty($gotopage)) { - ShowMsg('成功登录,正在转向管理管理主页!', $gotopage); + ShowMsg('成功登录,正在转向管理管理主页', $gotopage); exit(); } else { - ShowMsg('成功登录,正在转向管理管理主页!', "index.php"); + ShowMsg('成功登录,正在转向管理管理主页', "index.php"); exit(); } } - //error else if ($res == -1) { ResetVdValue(); - ShowMsg('你的用户名不存在!', 'login.php', 0, 1000); + ShowMsg('你的用户名不存在', 'login.php', 0, 1000); exit; } else { ResetVdValue(); - ShowMsg('你的密码错误!', 'login.php', 0, 1000); + ShowMsg('你的密码错误', 'login.php', 0, 1000); exit; } } - //password empty else { ResetVdValue(); - ShowMsg('用户和密码没填写完整!', 'login.php', 0, 1000); + ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000); exit; } } } - -include('templets/login.htm'); +include('templets/login.htm'); \ No newline at end of file diff --git a/src/dede/templets/article_add.htm b/src/dede/templets/article_add.htm index c008c45b..d3df39f2 100755 --- a/src/dede/templets/article_add.htm +++ b/src/dede/templets/article_add.htm @@ -1,144 +1,108 @@ - - - + + - + 增加文章 - - - - - - - - - - - + + + - + + + + + + + + - - - - + +
 文章列表 - >> 发布文章  栏目管理 文章列表 >> 发布文章栏目管理
- - +
- - + +
 常规信息 单页采集...常规信息单页采集
- +
- - + +
- - + + + +
 采集单个网页-URL:采集单个网页: -   -
- -
- - + + + - +
- -
+ - - - - + + + +
 文章标题: 简略标题: - - 文章标题:简略标题:
+ - + - - - -
 自定义属性:自定义属性: - SetQuery("Select * From `#@__arcatt` order by sortid asc"); $dsql->Execute(); while($trow = $dsql->GetObject()) @@ -155,44 +119,39 @@
+ - - - - + + + +
 TAG标签:(','号分开,单个标签小于12字节)权重:(越小越靠前)Tag标签:(','号分开,单个标签小于12字节)权重:(越小越靠前)
+ - + - +
 缩 略 图:缩略图:
- - - + + + 选择图片 @@ -206,25 +165,23 @@
- -
+ - + - + + + + @@ -232,72 +189,69 @@ - - - + - - @@ -307,52 +261,36 @@ - - - +
 文章来源:文章来源: - - 作 者:作者: - +
+ - +
 文章主栏目:文章主栏目: getUserChannel(),$channelid); - echo ""; - ?> - 快捷选择 -   + $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid); + echo ""; + ?> + + 快捷选择 选择副栏目"; - } - ?> + if($cfg_need_typeid2=='Y') + { + echo "选择副栏目"; + } + ?>
+ - - - + +
 关键字:
+
关键字: + + + +
+ - - - + + +
 内容摘要: 内容摘要:
-
 文章内容:
-
- -
-
- -
+
文章内容:
+
+
+ - +
 附加选项:附加选项: - - [设置] - - + + + [设置] + +
+ - +
 分页方式:分页方式: - -  大小: - K - (分页符为: #p#分页标题#e# ) + + + 大小: K(分页符为:#p#分页标题#e#)
@@ -360,55 +298,48 @@
- + ?>
- - + +
- +
 高级参数↑高级参数↑
- +
- - - - -
+ - +
 评论选项:评论选项: - -   - + + 浏览次数: - ' - style='width:100px;' /> +
+ - +
 文章排序:文章排序: 标题颜色: - - + +
+ - + - +
 阅读权限:阅读权限: 消费金币: -
+ - - + - - + +
 发布时间: + 发布时间: "; - - ?> + $nowtime = GetDateTimeMk(time()); + echo ""; + ?> 发布选项: - - 发布选项: + +
+ - - + +
 自定义文件名:(不包括后缀名如.html等)自定义文件名:(不包括后缀名如.html等) + if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1) + { + ?> 随机选择模板: "; - } - ?> + } else { + echo ""; + } + ?>
- - - -
  + + + + @@ -519,7 +443,6 @@
- + - \ No newline at end of file diff --git a/src/dede/templets/article_edit.htm b/src/dede/templets/article_edit.htm index 7ebeedac..58bc39a0 100755 --- a/src/dede/templets/article_edit.htm +++ b/src/dede/templets/article_edit.htm @@ -1,59 +1,45 @@ - - - + + - + 更改文章 - - - - - - - - - - - + + + - + + + + + + + + - - - - - + +
 文章列表 - >> 更改文章  栏目管理 文章列表 >> 更改文章栏目管理
@@ -61,9 +47,8 @@ @@ -72,108 +57,93 @@
- - + +
 常规信息 高级参数常规信息高级参数
-
- - - + + + + - +
- - - - - - - + if($cfg_need_typeid2=='Y') { + ?> - - + - + - + - - +
+ - - - - + + + +
 文章标题: 简略标题:文章标题:简略标题:
+ - - + +
 自定义属性: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 " "; - } - - else - { - echo " "; - } - } - ?>自定义属性: + 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 " "; + } else { + echo " "; + } + } + ?> +
+ - - + +
 跳转网址:" />跳转网址:">
+ - - + + - +
 Tag标签: - (','号分开,单个标签小于12字节)Tag标签:(','号分开,单个标签小于12字节) 权重: - (越小越靠前)(越小越靠前)
+ - - +
 缩 略 图:
"> - - + 缩略图: + + 选择图片 @@ -185,167 +155,163 @@ - " - style="height: 80px"> +
+ - - + - - + +
 文章来源:" size="16"> + 文章来源: + 作 者:"> - 作者: + + +
+ - - +
 文章主栏目:getUserChannel(),$channelid); - echo ""; - ?> - 快捷选择 + 文章主栏目: + getUserChannel(),$channelid); + echo ""; + ?> + 快捷选择
+ - - + +
 文章副栏目: - ' style='width:200px;' /> - 选择副栏目文章副栏目: + + + 选择副栏目 +
+ +
 文章内容:文章内容:
+ - + + + +
 附加选项:附加选项: - -
- - + + - - - @@ -354,87 +320,79 @@ if($cfg_need_typeid2=='Y') { - - - - +
-
+ - - +
  - - - - - -
+
+ +
@@ -445,5 +403,4 @@ if($cfg_need_typeid2=='Y') { - - + \ No newline at end of file diff --git a/src/dede/templets/content_list.htm b/src/dede/templets/content_list.htm index 78ee7408..a0f1cca4 100755 --- a/src/dede/templets/content_list.htm +++ b/src/dede/templets/content_list.htm @@ -1,7 +1,7 @@ - - + + - + 文档管理 @@ -13,144 +13,122 @@ + - - - - + +
-
- - {dede:if $adminid==$mid } - + + + {dede:if $adminid==$mid} + {else} - + {/dede:if} {dede:global.CheckUserSend/} - - - - + + + +
- -
- - -
◆ {dede:global.positionname/}文档列表  (使用鼠标右键弹出菜单) + + + + + - +
+ + + + + + + + + +
+ + 关键字: + + + +
+ +
+ + + + + - - + + - - + + - - - + + + {dede:datalist} - - - - + + + - + {/dede:datalist} - - + - - - -
{dede:global.positionname/}文档列表(使用鼠标右键弹出菜单)
ID选择文章标题选择文章标题 更新时间类目点击类目点击 HTML权限发布人操作权限发布人操作
- {dede:field.id/} - - - +
{dede:field.id/} - - {dede:field.title/} - + {dede:field.title/} {dede:field.flag function='IsCommendArchives(@me)'/} {dede:field.senddate function='GetDateMk(@me)'/}{dede:field.typeid function='GetTypename(@me)'/}{dede:field.typeid function='GetTypename(@me)'/} {dede:field.click/} {dede:field.ismake function="IsHtmlArchives(@me)"/} {dede:field.arcrank function="GetRankName(@me)"/} {dede:field.mid function=GetMemberName(@me)/} - - - + + +
-   +
全选 取消 -  更新  -  审核  -  推荐  -  移动  -  删除  -  自动关键字 \r\n"; ?> -  增加属性  -  删除属性  -
- {dede:pagelist listsize=3/} + 更新 + 审核 + 推荐 + 移动 + 删除 + 自动关键字"; ?> + 增加属性 + 删除属性
-
- -
- - - - + +
- - - - - - - - - -
- - - 关键字: - - - - - - - - -
-
{dede:pagelist listsize=6/}
diff --git a/src/dede/templets/desktop.ini b/src/dede/templets/desktop.ini new file mode 100644 index 00000000..96ee15ea --- /dev/null +++ b/src/dede/templets/desktop.ini @@ -0,0 +1,2 @@ +[LocalizedFileNames] +article_edit.htm=@article_edit.htm,0 diff --git a/src/dede/templets/diy_list.htm b/src/dede/templets/diy_list.htm index c6c66865..c138e03e 100755 --- a/src/dede/templets/diy_list.htm +++ b/src/dede/templets/diy_list.htm @@ -1,77 +1,80 @@ - + - - <?php echo $diy->name;?> + <?php echo $diy->name; ?> - - + + - - +
-
name;?>内容列表
+
name; ?>列表
- - + +
- {dede:datalist} '; - foreach($fieldlist as $field=>$fielddata) - { - if($fields[$field]=='') continue; - if($fielddata[1]=='img') + if(!empty($fields)) { - $fields[$field] = " 图片附件\r\n"; - } - else if($fielddata[1]=='addon') - { - $fields[$field] = " 其它附件"; - } - else - { - if(!in_array($fielddata[1],$allowhtml)){ - $fields[$field] = dede_htmlspecialchars($fields[$field]); + $allowhtml = array('htmltext'); + $fields['sta'] = $fields['ifcheck'] == 1 ?'已审核':'未审核'; + echo ''; + foreach($fieldlist as $field=>$fielddata) + { + if($fields[$field]=='') continue; + if($fielddata[1]=='img'){ + $fields[$field] = "图片附件\r\n"; + } + else if($fielddata[1]=='addon'){ + $fields[$field] = "其它附件"; + } else { + if(!in_array($fielddata[1],$allowhtml)){ + $fields[$field] = dede_htmlspecialchars($fields[$field]); + } + } + echo ''; } + } else { + echo ''; } - echo ''; - } -} else { - echo ""; -} -?> + ?> {/dede:datalist} - + -
-
 自定义表单管理 > 内容列表
- +
+ +
id'.$fields['id'].'   状态: '.$fields['sta'].'
'.$fields['id'].' '.$fields['sta'].'
'.$fielddata[0].''.$fields[$field].'
暂无记录
'.$fielddata[0].''.$fields[$field].'
暂无记录
{dede:pagelist listsize=5 /}{dede:pagelist listsize='8'/}
- - -    - + + + + + +
+ - \ No newline at end of file diff --git a/src/dede/templets/index2.htm b/src/dede/templets/index2.htm index 89d9a8d6..d3318fda 100755 --- a/src/dede/templets/index2.htm +++ b/src/dede/templets/index2.htm @@ -2,6 +2,7 @@ + <?php echo $cfg_webname; ?>后台管理 @@ -11,15 +12,15 @@ #skinlist{display:block;height:10px;margin-top:10px;overflow:hidden;width:86px} #skin div{float:left} #skin li{float:left;width:14px;height:10px;cursor:pointer} -#def div,#s1 div,#s2 div,#s3 div,#s4 div{background-image:url("images/skinbutton.png");background-repeat:no-repeat} +#def div,#s1 div,#s2 div,#s3 div,#s4 div{background-image:url(images/skinbutton.png)no-repeat} #s1 div{background-position:0 0px} #s2 div{background-position:0 -11px} #s3 div{background-position:0 -22px} #s4 div{background-position:0 -33px} -#s1 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px top transparent} -#s2 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -11px transparent} -#s3 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -22px transparent} -#s4 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -33px transparent} +#s1 div.sel{background:url(images/skinbutton.png)no-repeat scroll -14px top transparent} +#s2 div.sel{background:url(images/skinbutton.png)no-repeat scroll -14px -11px transparent} +#s3 div.sel{background:url(images/skinbutton.png)no-repeat scroll -14px -22px transparent} +#s4 div.sel{background:url(images/skinbutton.png)no-repeat scroll -14px -33px transparent} diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index b031fffd..1d1e26fd 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -3,7 +3,7 @@ 系统概况 - + diff --git a/src/dede/templets/index_menu2.htm b/src/dede/templets/index_menu2.htm index 788b51b9..2ad94454 100644 --- a/src/dede/templets/index_menu2.htm +++ b/src/dede/templets/index_menu2.htm @@ -1,89 +1,84 @@ - - - - DedeBIZ menu - - - - var curopenItem = '$openitem';"; - ?> - - - - - - - - - - - - - - - - -
-
核心
-
模块
-
生成
-
会员
- getUserType() >= 10) { - ?> -
模板
-
系统
- -
-
-
- getUserRank(), 'main'); - ?> -
-
-
-
-
-
-
-
-
- - - - - + + + + DedeBIZ menu + + + + var curopenItem = '$openitem';"; + ?> + + + + + + + + + + + + + + + + +
+
核心
+
模块
+
生成
+
会员
+ getUserType()>=10){ + ?> +
模板
+
系统
+ +
+
+
+ getUserRank(),'main'); + ?> +
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/dede/templets/login.htm b/src/dede/templets/login.htm index dd58e9bc..fa1da6f9 100755 --- a/src/dede/templets/login.htm +++ b/src/dede/templets/login.htm @@ -1,18 +1,19 @@ - + - + + <?php echo $cfg_webname; ?>后台登录