Merge pull request 'master' (#4) from Vaecq/DedeCMSV6:master into develop

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}

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
-}
+.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}

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}

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
-}
+.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}

src/dede/dialog/select_images.php

@@ -55,10 +55,10 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
 .napisdiv{left:40;top:10;width:150px;height:100px;position:absolute;z-index:3;display:none}
     </style>

src/dede/dialog/select_soft.php

@@ -48,10 +48,10 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
     </style>
 </head>
@@ -128,7 +128,7 @@ table{background:#fff}
                             </tr>\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<tr height='28'>
                             <td class='linerow'><a href=select_soft.php?f=$f&activepath=" . urlencode("$activepath/$file") . $addparm . "><img src='img/dir.gif'>$file</a></td>
@@ -168,7 +168,7 @@ table{background:#fff}
             </td>
         </tr>
         <tr>
-            <td colspan="3" height="30">请点击要选择的文件，红色字样的为刚上传的文件</td>
+            <td colspan="3" height="30">点击选择的文件，红色字样的为刚上传的文件</td>
         </tr>
     </table>
 </body>

src/dede/dialog/select_templets.php

@@ -40,10 +40,10 @@ if (empty($comeback)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
     </style>
 </head>
@@ -183,7 +183,7 @@ table{background:#fff}
                     <table width="100%">
                         <form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
                         <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
-                        <input type="hidden" name="f" value='<?php echo $f ?>'>
+                        <input type="hidden" name="f" value="<?php echo $f ?>">
                         <input type="hidden" name="job" value="upload">
                             <tr>
                                 <td>

src/dede/login.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 后台登录
  *
@@ -13,9 +12,7 @@ require_once(dirname(__FILE__) . '/../include/common.inc.php');
 require_once(DEDEINC . '/userlogin.class.php');
 if (empty($dopost)) $dopost = '';
 if (empty($gotopage)) $gotopage = '';
-
 $gotopage = RemoveXSS($gotopage);
-
 //检测安装目录安全性
 if (is_dir(dirname(__FILE__) . '/../install')) {
     if (!file_exists(dirname(__FILE__) . '/../install/install_lock.txt')) {
@@ -37,18 +34,15 @@ if (is_dir(dirname(__FILE__) . '/../install')) {
         fclose($fp);
     }
 }
-
 //更新服务器
 require_once(DEDEDATA . '/admin/config_update.php');
-
 //检测后台目录是否更名
 $cururl = GetCurUrl();
 if (preg_match('/dede\/login/i', $cururl)) {
-    $redmsg = '<div class=\'safe-tips\'>您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div>';
+    $redmsg = '<div class="alert alert-warning" role="alert"><div class=\"safe-tips\">您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div></div>';
 } 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');

src/dede/templets/article_add.htm

@@ -1,144 +1,108 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
   <title>增加文章</title>
-  <style type="text/css">
-    body {
-      background-image: url(images/allbg.gif);
-    }
-
-    .multipic {
-      border: 1px dashed #FC6;
-    }
-
-    .albCt {
-      border-bottom: 1px dashed #FC0;
-      margin-bottom: 10px;
-      padding-bottom: 10px;
-    }
-  </style>
   <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="css/base.css" rel="stylesheet" type="text/css">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <link href="../static/css/daterangepicker.css" rel="stylesheet">
-  <script type="text/javascript" src="../static/js/moment.min.js"></script>
-  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-  <script language='javascript' src="js/main.js"></script>
-  <script type="text/javascript" src="js/handlers.js"></script>
-  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="css/base.css" type="text/css">
+  <link rel="stylesheet" href="../static/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
-  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/cropper.min.css">
+  <script src="../static/js/jquery.js"></script>
+  <script src="../static/js/dedeajax2.js"></script>
+  <script src="../static/js/moment.min.js"></script>
+  <script src="../static/js/daterangepicker.js"></script>
+  <script src="js/main.js"></script>
+  <script src="js/handlers.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script src="../static/js/cropper.min.js"></script>
-  <script language="javascript">
+  <script>
     var arctype = 'article';
     function checkSubmit() {
       if (document.form1.title.value == '') {
-        ShowMsg('文章标题不能为空！');
+        ShowMsg('文章标题不能为空');
         return false;
       }
       if (document.form1.typeid.value == 0) {
-        ShowMsg('请选择档案的主类别！');
+        ShowMsg('请选择档案的主类别');
         return false;
       }
     }
   </script>
   <style>
-    .albCt img {
-      cursor: pointer;
-    }
-
-    img {
-      vertical-align: baseline;
-    }
-
-    input,
-    select {
-      height: auto !important;
-    }
+body{background-image:#ffffff}
+table{border-collapse:separate}
+img{vertical-align:baseline}
+.albCt img{cursor:pointer}
+input,select{height:auto !important}
+.multipic{border:1px dashed #FC6}
+.albCt{border-bottom:1px dashed #FC0;margin-bottom:10px;padding-bottom:10px}
   </style>
 </head>
-
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
     <tr>
-      <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
-          href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a>
-        &gt;&gt; 发布文章</td>
-      <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a class="btn btn-success btn-sm"
-          href="catalog_main.php">栏目管理</a> </td>
+      <td width="60%" height="30"><img src="images/book1.gif"><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">文章列表</a> &gt;&gt; 发布文章</td>
+      <td width="30%" align="right"><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
     </tr>
   </table>
-
-  <table width="97%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
     <tr>
       <td colspan="2">
         <table width="800" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td><a href="#" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集...</a></td>
+            <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
+            <td><a href="#" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集</a></td>
           </tr>
         </table>
       </td>
     </tr>
   </table>
-  <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FBFCE2" id="getone"
-    class="table table-borderless" style="<?php if(empty($geturl)) echo 'display:none'; ?>;margin:0;">
+  <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FBFCE2" id="getone" class="table table-borderless" style="<?php if(empty($geturl)) echo 'display:none'; ?>;margin:0">
     <form name="getonepage" action="article_add.php" method="get">
-      <input type="hidden" name="channelid" value="<?php echo $channelid; ?>" />
-      <input type="hidden" name="cid" value="<?php echo $cid; ?>" />
+      <input type="hidden" name="channelid" value="<?php echo $channelid; ?>">
+      <input type="hidden" name="cid" value="<?php echo $cid; ?>">
       <tr>
         <td colspan="2">
           <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="220" height="31"><strong><a name="downurl"></a>&nbsp;采集单个网页-URL：</strong></td>
-              <td width="360" align="center"><input name="geturl" type="text" id="geturl" style="width:290px"
-                  value="<?php echo $geturl; ?>" /></td>
+              <td width="160" height="30"><a name="downurl"></a>采集单个网页：</td>
+              <td width="360" align="center"><input name="geturl" type="text" id="geturl" style="width:260px" value="<?php echo $geturl; ?>"></td>
               <td>
                 <button type="submit" class='btn btn-success btn-sm' name="Submit3">抓取</button>
-                &nbsp;
-                <button type="button" class='btn btn-success btn-sm' name="setrule"
-                  onClick="OpenMyWinCoOne('article_coonepage_rule.php')">规则管理</button></td>
+                <button type="button" class='btn btn-success btn-sm' name="setrule" onClick="OpenMyWinCoOne('article_coonepage_rule.php')">规则管理</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
     </form>
   </table>
-
-  <form name="form1" action="article_add.php" enctype="multipart/form-data" method="post"
-    onSubmit="return checkSubmit()">
-    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-    <input type="hidden" name="dopost" value="save" />
+  <form name="form1" action="article_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>">
+    <input type="hidden" name="dopost" value="save">
     <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff">
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章标题：</td>
-              <td width='408'><input name="title" type="text" id="title" value="<?php echo $title; ?>"
-                  style="width:388px" /></td>
-              <td width="90">&nbsp;简略标题：</td>
-              <td>
-                <input name="shorttitle" type="text" id="shorttitle" style="width:150px" />
-              </td>
+              <td width="90" style="padding-left:10px">文章标题：</td>
+              <td width="400"><input name="title" type="text" id="title" value="<?php echo $title; ?>" style="width:380px"></td>
+              <td width="90" style="padding-left:10px">简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;自定义属性：</td>
+              <td width="100" style="padding-left:10px">自定义属性：</td>
               <td align="left">
-                <?php
+              <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
             	$dsql->Execute();
             	while($trow = $dsql->GetObject())
@@ -155,44 +119,39 @@
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline" id="redirecturltr" style="display:none">
+        <td height="26" colspan="5" class="bline" id="redirecturltr" style="display:none">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;跳转网址：</td>
-              <td>
-                <input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" />
-              </td>
+              <td width="90" style="padding-left:10px">跳转网址：</td>
+              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px" value=""></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
-              <td><input name="tags" type="text" id="tags" value="" style="width:300px"
-                  onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
-              <td width="47">权重：</td>
-              <td><input name="weight" type="text" id="weight" style="width:50px"
-                  value="<?php echo $maxWright['cc'];?>" />(越小越靠前)</td>
+              <td width="90" style="padding-left:10px">Tag标签：</td>
+              <td><input name="tags" type="text" id="tags" value="" style="width:300px" onChange="$Obj('keywords').value=this.value;">（','号分开，单个标签小于12字节）</td>
+              <td width="50">权重：</td>
+              <td><input name="weight" type="text" id="weight" style="width:60px" value="<?php echo $maxWright['cc'];?>">（越小越靠前）</td>
             </tr>
           </table>
         </td>
       </tr>
       <tr id="pictable">
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90"> &nbsp;缩 略 图：</td>
+              <td width="90" style="padding-left:10px">缩略图：</td>
               <td width="560">
                 <table width="100%" border="0" cellspacing="1" cellpadding="1">
                   <tr>
                     <td height="30">
-                      <input name="picname" type="text" id="picname" style="width:240px" />
-                      <button type="button" name="Submit2" style="margin-left:8px;"
-                        onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择</button>
-                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' /> 远程</label>
+                      <input name="picname" type="text" id="picname" style="width:240px">
+                      <button type="button" name="Submit2" style="margin-left:8px" onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择</button>
+                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'>远程</label>
                       <span class="btn btn-success btn-sm fileinput-button">
                         <i class="glyphicon glyphicon-plus"></i>
                         选择图片
@@ -206,25 +165,23 @@
                   </tr>
                 </table>
               </td>
-              <td width="150" align="center">
-                <img id="litPic" src="../static/defaultpic.gif" style="height: 80px">
-              </td>
+              <td width="150" align="center"><img id="litPic" src="../static/defaultpic.gif" style="height:80px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章来源：</td>
+              <td width="90" style="padding-left:10px">文章来源：</td>
               <td width="240">
-                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $source; ?>"
-                  size="16" />
-                <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button></td>
-              <td width="90">作　者：</td>
+                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $source; ?>" size="16">
+                <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button>
+              </td>
+              <td width="90" style="padding-left:10px">作者：</td>
               <td>
-                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $writer; ?>" />
+                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $writer; ?>">
                 <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button>
               </td>
             </tr>
@@ -232,72 +189,69 @@
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章主栏目：</td>
+              <td width="100" style="padding-left:10px">文章主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php
-          $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
-          echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-          echo "<option value='0'>请选择栏目...</option>\r\n";
-          echo $typeOptions;
-          echo "</select>";
-			?></span>
-                <img src='images//menusearch.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-                &nbsp;
+                  $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
+                  echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
+                  echo "<option value='0'>请选择栏目...</option>\r\n";
+                  echo $typeOptions;
+                  echo "</select>";
+                  ?>
+                </span>
+                <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择'>
                 <?php
-			if($cfg_need_typeid2=='Y')
-			{
-				echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
-			}
-			?>
+                if($cfg_need_typeid2=='Y')
+                {
+				          echo "<a href='javascript:AddTypeid2();' class='btn btn-success btn-sm'>选择副栏目</a>";
+                }
+                ?>
               </td>
             </tr>
           </table>
         </td>
       </tr>
-      <tr id='typeid2tr' style='display:none'>
-        <td height="24" colspan="5" class="bline">
+      <tr id="typeid2tr" style="display:none">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章副栏目：</td>
+              <td width="90" style="padding-left:10px">文章副栏目：</td>
               <td>
-                <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
-                  style='width:200px;' />
-                <img src='images/menusearch2.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
+                <span id="typeid2ct"></span>
+                <input type="text" name="typeid2" id="typeid2" value="" style="width:200px">
+                <img src="images/menusearch2.gif" style="cursor:pointer" onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt="选择副栏目" title="选择副栏目">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;关键字：</td>
-              <td width="448"><input type='text' name="keywords" id="keywords" style="width:80%"
-                  value="<?php echo $keywords; ?>" /> <button type="button" name="Submit" style="width:56;height:20"
-                  onClick="SelectKeywords('form1.keywords');" class='btn btn-success btn-sm'>浏览...</button></td>
-              <td><label><input name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey"
-                    value="1" <?php if($cfg_arc_autokeyword=='Y') echo ' checked="1" '; ?> />
-                  自动获取，手动填写用","分开</label><br />
+              <td width="90" style="padding-left:10px">关键字：</td>
+              <td width="450">
+                <input type='text' name="keywords" id="keywords" style="width:80%" value="<?php echo $keywords; ?>">
+                <button type="button" name="Submit" style="width:56;height:20" onClick="SelectKeywords('form1.keywords');" class='btn btn-success btn-sm'>浏览...</button>
+              </td>
+              <td>
+                <label><input name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey" value="1" <?php if($cfg_arc_autokeyword=='Y') echo ' checked="1" '; ?>>&nbsp;自动获取，手动填写用","分开</label><br>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;内容摘要：</td>
-              <td width="449"><textarea name="description" rows="5" id="description"
-                  style="width:80%;height:50px"><?php echo $description; ?></textarea></td>
-              <td width="261">&nbsp;</td>
+              <td width="90" style="padding-left:10px">内容摘要：</td>
+              <td width="450"><textarea name="description" rows="5" id="description"style="width:80%;height:50px"><?php echo $description; ?></textarea></td>
+              <td width="260"></td>
             </tr>
           </table>
         </td>
@@ -307,52 +261,36 @@
       </tr>
       <tr>
         <td height="28" colspan="2" bgcolor="#F9FCEF" class="bline2">
-          <div style='float:left;line-height:28px;'>&nbsp;<strong>文章内容：</strong></div>
-          <div style='float:right;;padding-right:8px'>
-            <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
-          </div>
-          <div style='float:right;padding-right:8px'>
-            <button type="submit" class="btn btn-success">保存</button>
-          </div>
+          <div style="float:left;padding-left:10px;line-height:26px">文章内容：</div>
+          <div style="float:right;;padding-right:10px"><button type="button" onClick="location.reload();" class="btn btn-success">重置</button></div>
+          <div style="float:right;padding-right:10px"><button type="submit" class="btn btn-success">保存</button></div>
         </td>
       </tr>
       <tr>
-        <td width="100%" height="24" colspan="2" class="bline">
+        <td width="100%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;附加选项：</td>
+              <td width="90" style="padding-left:10px">附加选项：</td>
               <td>
-                <label><input name="remote" type="checkbox" class="np" id="remote" value="1"
-                    <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?> />
-                  下载远程图片和资源</label>
-                <label><input name="dellink" type="checkbox" class="np" id="dellink" value="1"
-                    <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?> />
-                  删除非站内链接 </label><a href="javascript:OpenMyWin('article_allowurl_edit.php');">[设置]</a>
-                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1"
-                    <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?> />
-                  提取第一个图片为缩略图</label>
-                <label><input type='checkbox' name='needwatermark' value='1' class='np'
-                    <?php if($photo_markup=='1') echo "checked"; ?> />
-                  图片是否加水印</label>
+                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>&nbsp;下载远程图片和资源&nbsp;</label>
+                <label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?>>&nbsp;删除非站内链接&nbsp;</label>
+                <a href="javascript:OpenMyWin('article_allowurl_edit.php')">[设置]</a>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>&nbsp;提取第一个图片为缩略图&nbsp;</label>
+                <label><input type='checkbox' name='needwatermark' value='1' class='np' <?php if($photo_markup=='1') echo "checked"; ?>>&nbsp;图片是否加水印</label>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="100%" height="24" colspan="2" class="bline">
+        <td width="100%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;分页方式：</td>
+              <td width="90" style="padding-left:10px">分页方式：</td>
               <td>
-                <label><input name="sptype" type="radio" class="np" value="hand"
-                    <?php if($cfg_arcautosp=='N') echo " checked='1' "?> />
-                  手动</label>
-                <label><input type="radio" name="sptype" value="auto" class="np"
-                    <?php if($cfg_arcautosp=='Y') echo " checked='1' "?> />
-                  自动</label>　大小：
-                <input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" size="6" /> K
-                (分页符为： <font color="#FF0000">#p#分页标题#e# </font>)
+                <label><input name="sptype" type="radio" class="np" value="hand" <?php if($cfg_arcautosp=='N') echo " checked='1' "?>>&nbsp;手动&nbsp;</label>
+                <label><input type="radio" name="sptype" value="auto" class="np" <?php if($cfg_arcautosp=='Y') echo " checked='1' "?>>&nbsp;自动&nbsp;</label>
+                大小：<input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" size="6"> K（分页符为：#p#分页标题#e#）
               </td>
             </tr>
           </table>
@@ -360,55 +298,48 @@
       </tr>
       <tr>
         <td width="100%" id="arcBody">
-          <?php
+        <?php
         GetEditor("body",$body,450);
-	     ?>
+        ?>
         </td>
-        <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
-    <!-- //高级参数 -->
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1" style="margin-top:10px;">
+    <!--高级参数-->
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1" style="margin-top:10px">
       <tr>
         <td>
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;<a
-                  href='javascript:ShowHideT("adset")'><u>高级参数↑</u></a></td>
+              <td width="84" height="26" align="center" background="images/itemnote1.gif"><a href='javascript:ShowHideT("adset")'>高级参数↑</a></td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff">
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="22">&nbsp;评论选项：</td>
+              <td width="90" height="26" style="padding-left:10px">评论选项：</td>
               <td width="240">
-                <label><input type='radio' name='notpost' class='np' value='0'
-                    <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?> /> 允许评论 </label>
-                &nbsp;
-                <label><input type='radio' name='notpost' class='np' value='1'
-                    <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?> /> 禁止评论 </label>
+                <label><input type="radio" name="notpost" class="np" value="0" <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?>>&nbsp;允许评论&nbsp;</label>
+                <label><input type="radio" name="notpost" class="np" value="1" <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?>>&nbsp;禁止评论&nbsp;</label>
               </td>
               <td width="90">浏览次数：</td>
               <td>
-                <input type='text' name='click'
-                  value='<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>'
-                  style='width:100px;' />
+                <input type="text" name="click" value="<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>" style="width:100px">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="22">&nbsp;文章排序：</td>
+              <td width="90" height="26" style="padding-left:10px">文章排序：</td>
               <td width="240">
                 <select name="sortup" id="sortup" style="width:150px">
                   <option value="0" selected>默认排序</option>
@@ -420,98 +351,91 @@
                 </select> </td>
               <td width="90">标题颜色：</td>
               <td>
-                <input name="color" type="text" id="color" style="width:120px" />
-                <button class="btn btn-success btn-sm" name="modcolor" type="button" id="modcolor"
-                  onClick="ShowColor(event, this)">选取</button>
+                <input name="color" type="text" id="color" style="width:120px">
+                <button class="btn btn-success btn-sm" name="modcolor" type="button" id="modcolor" onClick="ShowColor(event, this)">选取</button>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;阅读权限：</td>
+              <td width="90" style="padding-left:10px">阅读权限：</td>
               <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
-                  <?php
+                <?php
                 $urank = $cuserLogin->getUserRank();
                 $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
                 $dsql->Execute();
                 while($row = $dsql->GetObject())
                 {
-                	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
+                	echo "<option value='".$row->rank."'>".$row->membername."</option>\r\n";
                 }
-              ?>
+                ?>
                 </select> </td>
               <td width="90">消费金币：</td>
-              <td>
-                <input name="money" type="text" id="money" value="0" size="10" /> </td>
+              <td><input name="money" type="text" id="money" value="0" size="10"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;发布时间：</td>
-              <td width="241">
+              <td width="90" style="padding-left:10px">发布时间：</td>
+              <td width="240">
                 <?php
-          $nowtime = GetDateTimeMk(time());
-          echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
-
-			     ?>
+                $nowtime = GetDateTimeMk(time());
+                echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
+                ?>
               </td>
-              <td width="90">发布选项：</td>
-              <td width="379">
-                <label><input name="ishtml" type="radio" class="np" value="1" checked="1" />
-                  生成HTML</label>
-                <label><input type="radio" name="ishtml" class="np" value="0" />
-                  仅动态浏览</label> </td>
+              <td width="90" style="padding-left:10px">发布选项：</td>
+              <td width="380">
+                <label><input name="ishtml" type="radio" class="np" value="1" checked="1">&nbsp;生成HTML&nbsp;</label>
+                <label><input type="radio" name="ishtml" class="np" value="0">&nbsp;仅动态浏览</label></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4">
+        <td height="26" colspan="4">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="109">&nbsp;自定义文件名：</td>
-              <td width="351"><input type="text" name="filename" id="filename" />（不包括后缀名如.html等）</td>
+              <td width="110" style="padding-left:10px">自定义文件名：</td>
+              <td width="350"><input type="text" name="filename" id="filename">（不包括后缀名如.html等）</td>
               <td width="340">
                 <?php
-  if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
-  {
-  ?>
+                if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
+                {
+                ?>
                 随机选择模板：
                 <select name='templet' id='templet' style='width:200px' size='1'>
                   <?php
-          $rndsel = mt_rand(1, count($cfg_tamplate_arr)) - 1;
-          foreach($cfg_tamplate_arr as $k=>$v)
-          {
-          	$v = trim($v);
-          	echo ($k==$rndsel ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
-          }
- ?>
+                  $rndsel = mt_rand(1, count($cfg_tamplate_arr)) - 1;
+                  foreach($cfg_tamplate_arr as $k=>$v)
+                  {
+                    $v = trim($v);
+                    echo ($k==$rndsel ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
+                  }
+                  ?>
                 </select>
                 <?php
-	}
-	else{
-		echo "<input type='hidden' name='templet' value='' />";
-	}
-  ?>
+                } else {
+                  echo "<input type='hidden' name='templet' value=''>";
+                }
+                ?>
               </td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F9FCEF"
-      style="border:1px solid #cfcfcf;border-top:none;" class="mb-3">
-      <tr height="35">
-        <td width="17%">&nbsp;</td>
-        <td width="83%" class="py-3">
+    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
+      <tr height="36">
+        <td width="4%"></td>
+        <td width="96%" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>
@@ -519,7 +443,6 @@
     </table>
   </form>
   <div id="__tmpbody" style="display:none"></div>
-  <script language='javascript'>InitPage();</script>
+  <script>InitPage();</script>
 </body>
-
 </html>

src/dede/templets/article_edit.htm

@@ -1,59 +1,45 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
   <title>更改文章</title>
-  <style type="text/css">
-    body {
-      background-image: url(images/allbg.gif);
-    }
-  </style>
   <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="css/base.css" rel="stylesheet" type="text/css">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <link href="../static/css/daterangepicker.css" rel="stylesheet">
-  <script type="text/javascript" src="../static/js/moment.min.js"></script>
-  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-  <script language="javascript" src="js/main.js"></script>
-  <script type="text/javascript" src="js/handlers.js"></script>
-  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="css/base.css" type="text/css">
+  <link rel="stylesheet" href="../static/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
-  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/cropper.min.css">
+  <script src="../static/js/jquery.js"></script>
+  <script src="../static/js/dedeajax2.js"></script>
+  <script src="../static/js/moment.min.js"></script>
+  <script src="../static/js/daterangepicker.js"></script>
+  <script src="js/main.js"></script>
+  <script src="js/handlers.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script src="../static/js/cropper.min.js"></script>
-  <script language="javascript">
+  <script>
     var swfu = null;
     var arctype = 'article';
     function checkSubmit() {
       if (document.form1.title.value == '') {
-        ShowMsg('文章标题不能为空！');
+        ShowMsg('文章标题不能为空');
         document.form1.title.focus();
         return false;
       }
     }
   </script>
   <style>
-    .albCt img {
-      cursor: pointer;
-    }
-
-    img {
-      vertical-align: baseline;
-    }
+body{background-image:#ffffff}
+table{border-collapse:separate}
+img{vertical-align:baseline}
+.albCt img{cursor:pointer}
   </style>
 </head>
-
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
     <tr>
-      <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
-          href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a>
-        &gt;&gt; 更改文章</td>
-      <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
-      <td width="1%">&nbsp;</td>
+      <td width="60%" height="30"><img src="images/book1.gif"><a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives">文章列表</a> &gt;&gt; 更改文章</td>
+      <td width="30%" align="right"><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
     </tr>
   </table>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
@@ -61,9 +47,8 @@
       <td colspan="2">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                onClick="ShowItem2()"><u>高级参数</u></a></td>
+            <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()">高级参数</a></td>
           </tr>
         </table>
       </td>
@@ -72,108 +57,93 @@
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
     <tr>
       <td colspan="2">
-        <table height="24" border="0" cellpadding="0" cellspacing="0">
+        <table height="26" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()">常规信息</a></td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>
         </table>
       </td>
     </tr>
   </table>
-  <form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post"
-    onSubmit="return checkSubmit();">
-    <input type="hidden" name="dopost" value="save" />
-    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-    <input type="hidden" name="id" value="<?php echo $aid?>" />
+  <form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+    <input type="hidden" name="dopost" value="save">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>">
+    <input type="hidden" name="id" value="<?php echo $aid?>">
     <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章标题：</td>
-              <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>"
-                  style="width:388px"></td>
-              <td width="90">&nbsp;简略标题：</td>
-              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"
-                  value="<?php echo $arcRow['shorttitle']; ?>"></td>
+              <td width="90" style="padding-left:10px">文章标题：</td>
+              <td width="400"><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:380px"></td>
+              <td width="90">简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px" value="<?php echo $arcRow['shorttitle']; ?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;自定义属性：</td>
-              <td><?php
-         $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
-         $dsql->Execute();
-         while($trow = $dsql->GetObject())
-         {
-         	if($trow->att=='j')
-         	{
-         		$jumpclick = " onclick='ShowUrlTr()'";
-         	}
-         	else
-         	{
-         		$jumpclick = '';
-         	}
-         	if(preg_match("#".$trow->att."#", $arcRow['flag']))
-         	{
-         		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' /> {$trow->attname}[{$trow->att}]</label> ";
-         	}
-
-         	else
-         	{
-         		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} /> {$trow->attname}[{$trow->att}]</label> ";
-         	}
-         }
-          ?></td>
+              <td width="100" style="padding-left:10px">自定义属性：</td>
+              <td>
+                <?php
+                $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
+                $dsql->Execute();
+                while($trow = $dsql->GetObject())
+                {
+                  if($trow->att=='j')
+                  {
+                    $jumpclick = " onclick='ShowUrlTr()'";
+                  } else {
+                    $jumpclick = '';
+                  }
+                  if(preg_match("#".$trow->att."#", $arcRow['flag']))
+                  {
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked'> {$trow->attname}[{$trow->att}]</label> ";
+                  } else {
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick}> {$trow->attname}[{$trow->att}]</label> ";
+                  }
+                }
+                ?>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline" id="redirecturltr"
-          style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
+        <td height="26" colspan="2" class="bline" id="redirecturltr" style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;跳转网址：</td>
-              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px"
-                  value="<?php echo $addRow["redirecturl"]?>" /></td>
+              <td width="90" style="padding-left:10px">跳转网址：</td>
+              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="<?php echo $addRow["redirecturl"]?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;Tag标签：</td>
-              <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
-                (','号分开，单个标签小于12字节)</td>
+              <td width="90" style="padding-left:10px">Tag标签：</td>
+              <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px">（','号分开，单个标签小于12字节）</td>
               <td width="40">权重：</td>
-              <td width="141"><input name="weight" type="text" id="weight" style="width:50px"
-                  value="<?php echo $arcRow['weight'];?>" />
-                (越小越靠前)</td>
+              <td width="160"><input name="weight" type="text" id="weight" style="width:60px" value="<?php echo $arcRow['weight'];?>">（越小越靠前）</td>
             </tr>
           </table>
         </td>
       </tr>
       <tr id="pictable">
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="81">&nbsp;缩 略 图：<br /></td>
-              <td><input name="picname" type="text" id="picname" style="width:300px"
-                  value="<?php echo $arcRow["litpic"]?>">
-
-                <label><input type='checkbox' class='np' name='ddisremote' value='1' />
-                远程</label>
+              <td width="90" height="80" style="padding-left:10px">缩略图：</td>
+              <td>
+                <input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow['litpic']?>">
+                <label><input type='checkbox' class='np' name='ddisremote' value='1'>远程</label>
                 <span class="btn btn-success btn-sm fileinput-button">
                   <i class="glyphicon glyphicon-plus"></i>
                   选择图片
@@ -185,167 +155,163 @@
                 </button>
               </td>
               <td align="center">
-                <img id="litPic"
-                  src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
-                  style="height: 80px">
+                <img id="litPic" src="<?php if($arcRow['litpic']!='') echo $arcRow['litpic']; else echo '../static/defaultpic.gif'; ?>" style="height:80px">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章来源：</td>
-              <td width="250"><input name="source" type="text" id="source" style="width:160px"
-                  value="<?php echo $arcRow["source"]?>" size="16">
+              <td width="90" style="padding-left:10px">文章来源：</td>
+              <td width="240">
+                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $arcRow['source']?>" size="16">
                 <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button></td>
-              <td width="90">作　者：</td>
-              <td><input name="writer" type="text" id="writer" style="width:120px"
-                  value="<?php echo $arcRow["writer"]?>">
-                <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button></td>
+              <td width="90">作者：</td>
+              <td>
+                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $arcRow['writer']?>">
+                <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章主栏目：</td>
-              <td><?php
-            $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
-            echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-            if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目...</option>\r\n";
-            echo $typeOptions;
-            echo "</select>";
-			     ?>
-                <img src='images/menusearch.gif' style='cursor:pointer'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid', '<?php echo $arcRow['typeid']; ?>')"
-                  alt='快捷选择' title='快捷选择' />
+              <td width="100" style="padding-left:10px">文章主栏目：</td>
+              <td>
+                <?php
+                $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
+                echo "<select name='typeid' id='typeid' style='width:240px'>";
+                if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目</option>";
+                echo $typeOptions;
+                echo "</select>";
+                ?>
+                <img src="images/menusearch.gif" style="cursor:pointer" onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid','<?php echo $arcRow['typeid']; ?>')" alt="快捷选择" title="快捷选择">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <?php
-if($cfg_need_typeid2=='Y') {
-?>
+      if($cfg_need_typeid2=='Y') {
+      ?>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章副栏目：</td>
-              <td><span id='typeid2ct'></span>
-                <input type='text' name='typeid2' id='typeid2'
-                  value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
-                <img src='images/menusearch2.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')"
-                  alt='选择副栏目' title='选择副栏目' /></td>
+              <td width="90" style="padding-left:10px">文章副栏目：</td>
+              <td>
+                <span id="typeid2ct"></span>
+                <input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0'?'':$arcRow['typeid2']); ?>" style="width:200px">
+                <img src="images/menusearch2.gif" style="cursor:pointer" onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2','<?php echo $arcRow['typeid2']; ?>')" alt="选择副栏目" title="选择副栏目">
+              </td>
             </tr>
           </table>
         </td>
       </tr>
-      <?php } ?>
+      <?php
+      }
+      ?>
       <tr>
-        <td colspan="2"><?php
-      PrintAutoFieldsEdit($cInfos['fieldset'],$addRow,'autofield');
-      ?></td>
+        <td colspan="2">
+          <?php
+          PrintAutoFieldsEdit($cInfos['fieldset'],$addRow,'autofield');
+          ?>
+        </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" bgcolor="#F9FCEF" class="bline2">&nbsp;文章内容：</td>
+        <td height="26" colspan="2" bgcolor="#F9FCEF" class="bline2" style="padding-left:10px">文章内容：</td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;附加选项：</td>
+              <td width="90" style="padding-left:10px">附加选项：</td>
               <td>
-                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>
-                下载远程图片和资源</label>
-                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>
-                提取第一个图片为缩略图</label> </td>
+                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>&nbsp;下载远程图片和资源&nbsp;</label>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>&nbsp;提取第一个图片为缩略图</label>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
         <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
-        <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
-    <!-- //高级参数 -->
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-      style="border:1px solid #cfcfcf;background:#ffffff;display:none">
+    <!--高级参数-->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff;display:none">
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="22">&nbsp;评论选项：</td>
+              <td width="110" height="26" style="padding-left:10px">评论选项：</td>
               <td width="250">
-                <label><input type='radio' name='notpost' class='np' value='0'
-                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />
-                允许评论</label>
-                &nbsp;
-                <label><input type='radio' name='notpost' class='np' value='1'
-                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />
-                禁止评论</label> </td>
+                <label><input type="radio" name="notpost" class="np" value="0" <?php if($arcRow['notpost']==0) echo " checked='1' "; ?>>&nbsp;允许评论&nbsp;</label>
+                <label><input type="radio" name="notpost" class="np" value="1" <?php if($arcRow['notpost']==1) echo " checked='1' "; ?>>&nbsp;禁止评论</label>
+              </td>
               <td width="90">浏览次数：</td>
-              <td><input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' /></td>
+              <td><input type="text" name="click" value="<?php echo $arcRow['click']; ?>" style="width:100px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;文章排序：</td>
-              <td width="250"><select name="sortup" id="sortup" style="width:150">
+              <td width="110" style="padding-left:10px">文章排序：</td>
+              <td width="250">
+                <select name="sortup" id="sortup" style="width:150">
                   <?php
-                $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
-                echo "<option value='0'>正常排序</option>\r\n";
-                if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
-                ?>
+                  $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
+                  echo "<option value='0'>正常排序</option>";
+                  if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>";
+                  ?>
                   <option value="7">置顶一周</option>
                   <option value="30">置顶一个月</option>
                   <option value="90">置顶三个月</option>
                   <option value="180">置顶半年</option>
                   <option value="360">置顶一年</option>
-                </select></td>
+                </select>
+              </td>
               <td width="90">标题颜色：</td>
-              <td><input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow["color"]?>">
-                <button name="modcolor" type="button" id="modcolor" onClick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button></td>
+              <td>
+                <input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow['color']?>">
+                <button name="modcolor" type="button" id="modcolor" onClick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;阅读权限：</td>
-              <td width="250"><select name="arcrank" id="arcrank" style="width:150">
+              <td width="110" style="padding-left:10px">阅读权限：</td>
+              <td width="250">
+                <select name="arcrank" id="arcrank" style="width:150">
                   <option value='<?php echo $arcRow["arcrank"]?>'> <?php echo $arcRow["rankname"]?> </option>
                   <?php
-                $urank = $cuserLogin->getUserRank();
-
-                $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
-                $dsql->Execute();
-                while($row = $dsql->GetObject()){
-                	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
-                }
-              ?>
-                </select></td>
+                  $urank = $cuserLogin->getUserRank();
+                  $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
+                  $dsql->Execute();
+                  while($row = $dsql->GetObject()){
+                    echo "<option value='".$row->rank."'>".$row->membername."</option>";
+                  }
+                  ?>
+                </select>
+              </td>
               <td width="90">发布选项：</td>
               <td>
-                <label><input name="ishtml" type="radio" class="np" value="1"
-                  <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-                生成HTML</label>
-                <label><input type="radio" name="ishtml" class="np" value="0"
-                  <?php if($arcRow["ismake"]==-1) echo " checked";?>>
-                仅动态浏览</label></td>
+                <label><input name="ishtml" type="radio" class="np" value="1" <?php if($arcRow["ismake"]!=-1) echo " checked";?>>&nbsp;生成HTML&nbsp;</label>
+                <label><input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>&nbsp;仅动态浏览</label></td>
             </tr>
           </table>
         </td>
@@ -354,87 +320,79 @@ if($cfg_need_typeid2=='Y') {
         <td height="75" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;更新时间：</td>
+              <td width="110" style="padding-left:10px">更新时间：</td>
               <td width="250"><?php
               $nowtime = GetDateTimeMk(time());
               echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
               ?>
               </td>
-              <td width="92">消费金币：</td>
-              <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>"
-                  size="10"></td>
+              <td width="90">消费金币：</td>
+              <td width="370"><input name="money" type="text" id="money" value="<?php echo $arcRow['money']?>" size="10"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="51">&nbsp;关键字：</td>
-              <td><input type="text" name="keywords" id="keywords" style="width:60%"
-                  value="<?php echo $arcRow["keywords"]?>" /></td>
+              <td width="110" height="50" style="padding-left:10px">关键字：</td>
+              <td><input type="text" name="keywords" id="keywords" style="width:60%" value="<?php echo $arcRow['keywords']?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="51">&nbsp;文章摘要：</td>
-              <td><textarea name="description" rows="5" id="description"
-                  style="width:80%"><?php echo $arcRow["description"]?></textarea></td>
+              <td width="110" height="50" style="padding-left:10px">文章摘要：</td>
+              <td><textarea name="description" rows="5" id="description" style="width:80%"><?php echo $arcRow['description']?></textarea></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4">
+        <td height="26" colspan="4">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;自定义文件名：</td>
-              <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />
-                （不包括后缀名如.html等）</td>
-              <td><?php
-  if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
-  {
-  ?>
+              <td width="110" style="padding-left:10px">自定义文件名：</td>
+              <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow['filename']?>">（不包括后缀名如.html等）</td>
+              <td>
+                <?php
+                if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
+                {
+                ?>
                 模板选择：
-                <select name='templet' id='templet' style='width:200px' size='1'>
+                <select name="templet" id="templet" style="width:200px" size="1">
                   <?php
-     foreach($cfg_tamplate_arr as $k=>$v)
-     {
-         $v = trim($v);
-         echo ($v==$addRow['templet'] ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
-     }
- ?>
+                  foreach($cfg_tamplate_arr as $k=>$v)
+                  {
+                    $v = trim($v);
+                    echo ($v==$addRow['templet'] ? "<option value='$v' selected>$v</option>":"<option value='$v'>$v</option>");
+                  }
+                  ?>
                 </select>
                 <?php
-	}
-	else{
-		echo "<input type='hidden' name='templet' value='{$addRow['templet']}' />";
-	}
-  ?></td>
+                } else {
+                  echo "<input type='hidden' name='templet' value='{$addRow['templet']}'>";
+                }
+                ?>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
-      style="border:1px solid #cfcfcf;border-top:none;" class="mb-3">
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
       <tr>
-        <td height="35">
+        <td height="36">
           <table width="100%" border="0" cellspacing="1" cellpadding="1">
             <tr>
-              <td width="17%">&nbsp;</td>
-              <td width="83%">
-                <table width="214" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td width="115" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
-                    <td width="99" class="py-3"><button type="button" onClick="location.reload();" class="btn btn-success">重置</button></td>
-                  </tr>
-                </table>
+              <td width="4%"></td>
+              <td width="96%">
+                <button type="submit" class="btn btn-success">保存</button>
+                <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
               </td>
             </tr>
           </table>
@@ -445,5 +403,4 @@ if($cfg_need_typeid2=='Y') {
   </form>
   <div id="__tmpbody" style="display:none"></div>
 </body>
-
-</html>
+</html>

src/dede/templets/content_list.htm

@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<meta charset="<?php echo $cfg_soft_lang; ?>">
 	<title>文档管理</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
@@ -13,144 +13,122 @@
 	<script src="js/context_menu.js"></script>
 	<script src="js/main.js"></script>
 	<script src="js/list.js"></script>
+	<style>
+.btn+.btn{margin-left:10px}
+	</style>
 </head>
-
-<body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
-	<!--快速转换位置按钮-->
-	<table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" class="table maintable table-bordered mt-3">
+<body leftmargin="8" topmargin="8" background="images/allbg.gif" onLoad="ContextMenu.intializeContextMenu()">
+	<table width="98%" cellspacing="0" cellpadding="0" align="center" class="table maintable table-bordered mt-3">
 		<tr>
-			<td align="center">
-				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
-				{dede:if $adminid==$mid }
-				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
+			<td>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
+				{dede:if $adminid==$mid}
+				<button type="button" class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
 				{else}
-				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
 				{/dede:if}
 				{dede:global.CheckUserSend/}
-				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_main.php';">栏目管理</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='recycling.php?cid={dede:global.cid/}';">文章回收站</button>
+				<button type="button" class="btn btn-success btn-sm" onClick="location='catalog_main.php';">栏目管理</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb1" onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb2" onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
+				<button type="button" class="btn btn-success btn-sm" name="bb1" onClick="location='recycling.php?cid={dede:global.cid/}';">文档回收站</button>
 			</td>
 		</tr>
 	</table>
-	<!--内容列表-->
-	<form name="form2">
-		<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center"
-			style="margin-top:8px" class="table table-bordered maintable">
-			<tr bgcolor="#E7E7E7">
-				<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
+	<form name="form3" action="content_list.php" method="get">
+		<input type="hidden" name="dopost" value="listArchives">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+			<tr>
+				<td style="background:#f2f2f2">
+					<table cellpadding="0" cellspacing="0" height="36">
+						<tr>
+							<td>
+								<select name="cid" style="margin:0 10px;width:160px">
+									<option value="0">选择栏目</option>
+									{dede:global.optionarr/}
+								</select>
+							</td>
+							<td>关键字：</td>
+							<td><input name="keyword" type="text" value="{dede:global.keyword/}" style="margin-right:10px;width:260px"></td>
+							<td>
+								<select name="orderby" style="margin-right:10px;width:160px">
+									<option value="id">选择排序</option>
+									<option value="pubdate">更新时间</option>
+									<option value="sortrank">置顶权值</option>
+									<option value="click">点击量</option>
+									<option value="scores">评论积分</option>
+									<option value="lastpost">最后评论</option>
+								</select>
+							</td>
+							<td>
+								<select name="flag" style="margin-right:10px;width:160px">
+									<option value="">选择属性</option>
+									{dede:global.flagsArr/}
+								</select>
+							</td>
+							<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
+						</tr>
+					</table>
 				</td>
 			</tr>
-			<tr align="center" bgcolor="#FBFCE2" height="25">
+		</table>
+	</form>
+	<form name="form2">
+		<table width="98%" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center" class="table table-bordered maintable" style="margin-top:10px">
+			<tr>
+				<td height="30" colspan="10" style="margin-left:10px;background:#f2f2f2">{dede:global.positionname/}文档列表（使用鼠标右键弹出菜单）</td>
+			</tr>
+			<tr align="center" bgcolor="#FBFCE2" height="26">
 				<td width="6%">ID</td>
-				<td width="4%">选择</td>
-				<td width="25%">文章标题</td>
+				<td width="6%">选择</td>
+				<td width="30%">文章标题</td>
 				<td width="10%">更新时间</td>
-				<td width="10%">类目</td>
-				<td width="8%">点击</td>
+				<td width="14%">类目</td>
+				<td width="6%">点击</td>
 				<td width="6%">HTML</td>
-				<td width="8%">权限</td>
-				<td width="8%">发布人</td>
-				<td width="12%">操作</td>
+				<td width="6%">权限</td>
+				<td width="6%">发布人</td>
+				<td width="10%">操作</td>
 			</tr>
 			{dede:datalist}
-			<tr align='center' bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-				<td nowrap>
-					{dede:field.id/}
-				</td>
-				<td>
-					<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
-				</td>
-				<td align='left'>
+			<tr align="center" bgcolor="#ffffff" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#ffffff';">
+				<td>{dede:field.id/}</td>
+				<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np"></td>
+				<td align="left">
 					<span id="arc{dede:field.id/}">
-						<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'
-							oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="
-							str_replace('\'', '' , @me)" /}')">
-							<u>{dede:field.title/}</u>
-						</a>
+						<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives" oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="str_replace('\'','',@me)"/}')">{dede:field.title/}</a>
 					</span>
 					{dede:field.flag function='IsCommendArchives(@me)'/}
 				</td>
 				<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
-				<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid function='GetTypename(@me)'/}</a></td>
+				<td><a href="content_list.php?cid={dede:field.typeid/}">{dede:field.typeid function='GetTypename(@me)'/}</a></td>
 				<td>{dede:field.click/}</td>
 				<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
 				<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
 				<td>{dede:field.mid function=GetMemberName(@me)/}</td>
 				<td>
-					<a href="javascript:;" title="编辑属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}', event, this);"> <i class="fa fa-cogs" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"> <i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"> <i class="fa fa-globe" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}',event,this);"><i class="fa fa-cogs" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"><i class="fa fa-globe" aria-hidden="true"></i></a>
 				</td>
 			</tr>
 			{/dede:datalist}
-			<tr bgcolor="#ffffff">
-				<td height="36" colspan="10">
-					&nbsp;
+			<tr>
+				<td height="36" colspan="10" style="margin-left:10px;background:#ffffff">
 					<a class="btn btn-success btn-sm" href="javascript:selAll()">全选</a>
 					<a class="btn btn-success btn-sm" href="javascript:noSelAll()">取消</a>
-					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">&nbsp;更新&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">&nbsp;审核&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">&nbsp;推荐&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:;"
-						onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
-						class="coolbg">&nbsp;移动&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:delArc(0)">&nbsp;删除&nbsp;</a>
-					<?php if($channelid==1) echo "	<a class='btn btn-success btn-sm' href='javascript:kwArc(0)' class='coolbg'>&nbsp;自动关键字&nbsp;</a>\r\n"; ?>
-					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
-					<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="btn btn-success btn-sm">&nbsp;删除属性&nbsp;</a>
-				</td>
-			</tr>
-			<tr align="right" bgcolor="#F9FCEF">
-				<td height="36" colspan="10" align="center">
-					{dede:pagelist listsize=3/}
+					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">更新</a>
+					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">审核</a>
+					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">推荐</a>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid)?0:$channelid); ?>)">移动</a>
+					<a class="btn btn-danger btn-sm" href="javascript:delArc(0)">删除</a>
+					<?php if($channelid==1) echo "<a class='btn btn-success btn-sm' href='javascript:kwArc(0)'>自动关键字</a>"; ?>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)">增加属性</a>
+					<a class="btn btn-danger btn-sm" href="javascript:;" onClick="cAtts('attsDel',event,this)">删除属性</a>
 				</td>
 			</tr>
-		</table>
-	</form>
-	<!--搜索表单-->
-	<form name='form3' action='content_list.php' method='get'>
-		<input type='hidden' name='dopost' value='listArchives' />
-		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center" style="margin-top:8px;border:1px solid #dee2e6" class="mb-3">
-			<tr bgcolor='#EEF4EA'>
-				<td background='images/wbg.gif' align='center'>
-					<table border='0' cellpadding='0' cellspacing='0' height="32">
-						<tr>
-							<td width='160'>
-								<select name='cid' style='width:150px'>
-									<option value='0'>选择栏目...</option>
-									{dede:global.optionarr /}
-								</select>
-							</td>
-							<td nowrap>
-								关键字：
-							</td>
-							<td width='130'>
-								<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:120px' />
-							</td>
-							<td width='90'>
-								<select name='orderby' style='width:80px'>
-									<option value='id'>排序...</option>
-									<option value='pubdate'>更新时间</option>
-									<option value='sortrank'>置顶权值</option>
-									<option value='click'>点击量</option>
-									<option value='scores'>评论积分</option>
-									<option value='lastpost'>最后评论</option>
-								</select>
-							</td>
-							<td width='90'>
-								<select name='flag' style='width:80px'>
-									<option value=''>属性...</option>
-									{dede:global.flagsArr /}
-								</select>
-							</td>
-							<td>
-								<button type="submit" class="btn btn-success">搜索</button>
-							</td>
-						</tr>
-					</table>
-				</td>
+			<tr>
+				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize=6/}</td>
 			</tr>
 		</table>
 	</form>

src/dede/templets/desktop.ini

@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+article_edit.htm=@article_edit.htm,0

src/dede/templets/diy_list.htm

@@ -1,77 +1,80 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-	<title><?php echo $diy->name;?></title>
+	<title><?php echo $diy->name; ?></title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-	<link href="css/base.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="css/base.css">
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
 	<div class="bodytitle mt-3">
 		<div class="bodytitleleft"></div>
-		<div class="bodytitletxt" style="padding-left:10px;"><?php echo $diy->name;?>内容列表</div>
+		<div class="bodytitletxt" style="padding-left:10px;"><?php echo $diy->name; ?>列表</div>
 	</div>
 	<form action="diy_list.php" method="post">
-		<input type="hidden" name="diyid" value="<?php echo $diyid;?>" />
-		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable"
-			style="background:#CFCFCF;">
+		<input type="hidden" name="diyid" value="<?php echo $diyid; ?>">
+		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="background:#CFCFCF">
 			<tr>
-				<td colspan="3" height="28" background='images/tbg.gif'>
-					<div style='float:left'>&nbsp;<a href='diy_main.php'><b>自定义表单管理</b></a> &gt; <b>内容列表</b></div>
-					<div style='float:right;padding-right:8px;'>
-						<a href="../plus/diy.php?action=list&diyid=<?php echo $diy->diyid; ?>" target="_blank"><img
-								src='images/gtk-tmp.png' align='left' title='预览' alt='预览' /><u>前台预览</u></a>
-					</div>
+				<td colspan="3" height="28" background="images/tbg.gif">
+					<div style="float:left"><a href="diy_main.php">自定义表单管理</a> &gt; <?php echo $diy->name; ?></div>
+					<div style="float:right;padding-right:10px"><a href="/plus/diy.php?action=list&diyid=<?php echo $diy->diyid; ?>" target="_blank"><img src="images/gtk-tmp.png" align="left" title="前台预览">前台预览</a></div>
 				</td>
 			</tr>
 			{dede:datalist}
 			<?php 
-if(!empty($fields))
-{
-		$allowhtml = array('htmltext');
-		$fields['sta'] = $fields['ifcheck'] == 1 ? '已审核' : '未审核';    
-		echo '<tr bgcolor="#F8FDE3"><td width="20%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np" />id</td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> &nbsp; 状态: '.$fields['sta'].'</td><td width="10%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="45" height="18"></a></td></tr>';
-		foreach($fieldlist as $field=>$fielddata)
-		{
-			if($fields[$field]=='') continue;
-			if($fielddata[1]=='img')
+			if(!empty($fields))
 			{
-				$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0' /> 图片附件</a>\r\n";
-			}
-			else if($fielddata[1]=='addon')
-			{
-				$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0' /> 其它附件</a>";
-			}
-			else
-			{
-				if(!in_array($fielddata[1],$allowhtml)){
-					$fields[$field] = dede_htmlspecialchars($fields[$field]);
+				$allowhtml = array('htmltext');
+				$fields['sta'] = $fields['ifcheck'] == 1 ?'已审核':'未审核';
+				echo '<tr bgcolor="#F8FDE3" height="28"><td width="18%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np"></td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> '.$fields['sta'].'</td><td width="12%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="46" height="18"></a></td></tr>';
+				foreach($fieldlist as $field=>$fielddata)
+				{
+					if($fields[$field]=='') continue;
+					if($fielddata[1]=='img'){
+					$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0'>图片附件</a>\r\n";
+					}
+					else if($fielddata[1]=='addon'){
+					$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0'>其它附件</a>";
+					} else {
+						if(!in_array($fielddata[1],$allowhtml)){
+							$fields[$field] = dede_htmlspecialchars($fields[$field]);
+						}
+					}
+					echo '<tr height="28"><td bgcolor="#fff">'.$fielddata[0].'</td><td bgcolor="#fff" colspan="2">'.$fields[$field].'</td></tr>';
 				}
+			} else {
+				echo '<tr height="28"><td bgcolor="#fff">暂无记录</td></tr>';
 			}
-			echo '<tr><td bgcolor="#ffffff" >'.$fielddata[0].'</td><td bgcolor="#ffffff" colspan="2">'.$fields[$field].'</td></tr>';		
-		}
-} else {
-	echo "<tr><td bgcolor=\"#ffffff\">暂无记录</td></tr>";
-}
-?>
+			?>
 			{/dede:datalist}
 			<tr>
-				<td colspan="3" bgcolor="#ffffff">{dede:pagelist listsize=5 /}</td>
+				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='8'/}</td>
 			</tr>
 			<tr>
-				<td colspan="3" height='36' align="center" bgcolor="#F8FCF1">
-					<label><input type="radio" name="action" value="check" class='np' /> 审核</label>
-					<label><input type="radio" name="action" value="delete" class='np' /> 删除</label>
-					&nbsp;&nbsp;
-					<button type="submit" name="submit" class='btn btn-success'>提交</button>
+				<td colspan="3" height="36" bgcolor="#F8FCF1">
+					<label><input type="button" name="select" onClick="selAll()" value="全选"></label>
+					<label><input type="button" name="select" onClick="noSelAll()" value="取消"></label>
+					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="check">审核</label>
+					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="delete">删除</label>
+					<label><input type="submit" name="submit" class="btn btn-success btn-sm" value="提交"></label>
 				</td>
 			</tr>
 		</table>
 	</form>
+	<script>
+	function selAll(){
+    	var a = document.getElementsByTagName("input");
+    	for (var i = 0; i < a.length; i++){
+        	if (a[i].type == "checkbox") a[i].checked = true;
+    	}
+	}
+	function noSelAll(){
+    	var a = document.getElementsByTagName("input");
+    	for (var i = 0; i < a.length; i++){
+        	if (a[i].type == "checkbox") a[i].checked = false;
+    	}
+	}
+	</script>
 </body>
-
 </html>

src/dede/templets/index2.htm

@@ -2,6 +2,7 @@
 <html>
 <head>
     <meta charset="<?php echo $cfg_soft_lang; ?>">
+    <meta name="robots" content="noindex,nofollow">
     <title><?php echo $cfg_webname; ?>后台管理</title>
     <link rel="stylesheet" href="css/frame.css">
     <link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
@@ -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}
     </style>
 </head>
 <body class="showmenu">

src/dede/templets/index_body.htm

@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
     <title>系统概况</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
     <base target="_self">
     <link rel="stylesheet" href="../static/css/bootstrap.min.css">
     <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">

src/dede/templets/index_menu2.htm

@@ -1,89 +1,84 @@
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-	<title>DedeBIZ menu</title>
-	<link rel="stylesheet" href="css/base.css">
-	<script src="../static/js/dedeajax2.js"></script>
-	<script src="../static/js/jquery.js"></script>
-	<?php
-	echo "<script>var curopenItem = '$openitem';</script>";
-	?>
-	<script src="js/leftmenu.js"></script>
-	<style>
-body{margin:0;background:#f2f2f2 url(images/leftmenu_bg.gif);padding-left:6px;overflow:scroll;overflow-x:hidden}
-div{margin:0;padding:0}
-img{margin-right:0}
-dl.bitem{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg.gif) repeat-x;clear:both}
-dl.bitem2{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg2.gif) repeat-x;clear:both}
-dl.bitem dt,dl.bitem2 dt{padding-left:30px;height:26px;line-height:26px;cursor:pointer}
-dl.bitem dt b,dl.bitem2 dt b{color:#4D6C2F}
-dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#fff}
-div.items{clear:both;padding:0;height:0}
-.fllct{float:left;width:80px}
-.flrct{float:left;padding-top:4px}
-.sitemu li{padding:0 0 0 20px;height:26px;line-height:26px;background:url(images/arr4.gif) no-repeat 6px 10px}
-a.mmac div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#325304;background:url(images/leftbg2.gif) no-repeat;word-wrap:break-word;word-break:break-all}
-a.mm div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#475645;cursor:pointer;background:url(images/leftmbg1.gif) no-repeat;word-wrap:break-word;word-break:break-all}
-a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif) no-repeat}
-.mmf{padding:6px;height:1px}
-#mainct{padding-top:12px;background:url(images/idnbg1.gif) repeat-y}
-	</style>
-	<link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
-	<base target="main">
-</head>
-
-<body target="main" onLoad="CheckOpenMenu();">
-	<table width="180" align="left" border='0' cellspacing='0' cellpadding='0' style="text-align:left;">
-		<tr>
-			<td valign='top' style='padding-top:10' width='20'>
-				<a id='link1' class='mmac'><div onClick="ShowMainMenu(1)">核心</div></a>
-				<a id='link100' class='mm'><div onClick="ShowMainMenu(100)">模块</div></a>
-				<a id='link5' class='mm'><div onClick="ShowMainMenu(5)">生成</div></a>
-				<a id='link6' class='mm'><div onClick="ShowMainMenu(6)">会员</div></a>
-				<?php
-				if($cuserLogin->getUserType() >= 10) {
-				?>
-				<a id='link7' class='mm'><div onClick="ShowMainMenu(7)">模板</div></a>
-				<a id='link10' class='mm'><div onClick="ShowMainMenu(10)">系统</div></a>
-				<?php
-				}
-				?>
-				<div class='mmf'></div>
-			</td>
-			<td width='160' id='mainct' valign="top">
-				<div id='ct1'>
-				<?php
-				GetMenus($cuserLogin->getUserRank(), 'main');
-				?>
-				</div>
-				<div id='ct100'></div>
-				<div id='ct3'></div>
-				<div id='ct5'></div>
-				<div id='ct6'></div>
-				<div id='ct7'></div>
-				<div id='ct20'></div>
-				<div id='ct10'></div>
-			</td>
-		</tr>
-		<tr>
-			<td width='26'></td>
-			<td width='160' valign='top'><img src='images/idnbgfoot.gif'></td>
-		</tr>
-	</table>
-	<?php
-	if(!empty($openitem) && $openitem!=1)
-	{
-	?>
-	<script>
-	ShowMainMenu(100);
-	</script>
-	<?php
-	}
-	?>
-	<script>
-	function myAlert() {
-		alert('dede');
-	}
-	</script>
-</body>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<title>DedeBIZ menu</title>
+	<link rel="stylesheet" href="css/base.css">
+	<script src="../static/js/dedeajax2.js"></script>
+	<script src="../static/js/jquery.js"></script>
+	<?php
+	echo "<script>var curopenItem = '$openitem';</script>";
+	?>
+	<script src="js/leftmenu.js"></script>
+	<style>
+body{margin:0;background:#f2f2f2;padding-left:8px;overflow:scroll;overflow-x:hidden}
+img{margin-right:0}
+div{margin:0;padding:0}
+dl.bitem{margin:0 0 0 10px;width:140px;background:url(images/menunewbg.gif)repeat-x;clear:both}
+dl.bitem2{margin:0 0 0 10px;width:140px;background:url(images/menunewbg2.gif)repeat-x;clear:both}
+dl.bitem dt,dl.bitem2 dt{padding-left:30px;height:26px;line-height:26px;cursor:pointer}
+dl.bitem dt b,dl.bitem2 dt b{color:#4D6C2F}
+dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#ffffff}
+div.items{clear:both;padding:0;height:0}
+.fllct{float:left;width:80px}
+.flrct{float:left;padding-top:4px}
+.sitemu li{padding:0 0 0 20px;height:26px;line-height:26px;background:url(images/arr4.gif)no-repeat 6px 10px}
+a.mmac div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#325304;background:url(images/leftbg2.gif)no-repeat;word-wrap:break-word;word-break:break-all}
+a.mm div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#475645;cursor:pointer;background:url(images/leftmbg1.gif) no-repeat;word-wrap:break-word;word-break:break-all}
+a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif)no-repeat}
+.mmf{padding:6px;height:1px}
+#mainct{padding-top:12px;background:url(images/idnbg1.gif)repeat-y}
+	</style>
+	<link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
+	<base target="main">
+</head>
+
+<body target="main" onLoad="CheckOpenMenu();">
+	<table width="180" align="left" cellspacing="0" cellpadding="0">
+		<tr>
+			<td valign="top" style="padding-top:10" width="20">
+				<a id="link1" class="mmac"><div onClick="ShowMainMenu(1)">核心</div></a>
+				<a id="link100" class="mm"><div onClick="ShowMainMenu(100)">模块</div></a>
+				<a id="link5" class="mm"><div onClick="ShowMainMenu(5)">生成</div></a>
+				<a id="link6" class="mm"><div onClick="ShowMainMenu(6)">会员</div></a>
+				<?php
+				if($cuserLogin->getUserType()>=10){
+				?>
+				<a id="link7" class="mm"><div onClick="ShowMainMenu(7)">模板</div></a>
+				<a id="link10" class="mm"><div onClick="ShowMainMenu(10)">系统</div></a>
+				<?php
+				}
+				?>
+				<div class="mmf"></div>
+			</td>
+			<td width="160" id="mainct" valign="top">
+				<div id="ct1">
+				<?php
+				GetMenus($cuserLogin->getUserRank(),'main');
+				?>
+				</div>
+				<div id="ct100"></div>
+				<div id="ct3"></div>
+				<div id="ct5"></div>
+				<div id="ct6"></div>
+				<div id="ct7"></div>
+				<div id="ct20"></div>
+				<div id="ct10"></div>
+			</td>
+		</tr>
+		<tr>
+			<td width="26"></td>
+			<td width="160" valign="top"><img src='images/idnbgfoot.gif'></td>
+		</tr>
+	</table>
+	<?php
+	if(!empty($openitem) && $openitem!=1)
+	{
+	?>
+	<script>
+	ShowMainMenu(100);
+	</script>
+	<?php
+	}
+	?>
+</body>
 </html>

src/dede/templets/login.htm

@@ -1,18 +1,19 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html>
 <head>
 	<meta charset="<?php echo $cfg_soft_lang; ?>">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="robots" content="noindex,nofollow">
+	<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="../static/css/dede.css">
 	<title><?php echo $cfg_webname; ?>后台登录</title>
 	<style>
-body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background-color:#f2f2f2}
-header{background:#fff}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background:#f2f2f2}
+header{background:#ffffff}
 header .logo{width:260px;padding:1em 0}
 .login-from{max-width:580px;width:100%}
-.login-area{background-color:#fff;padding:2em}
+.login-area{background:#ffffff;padding:2em;border-radius:.25rem}
 .login-area .btnLogin{width:100%}
 .login-power{padding-top:1em}
 .login-power a,.goindex a{color:#3DB058}
@@ -32,12 +33,10 @@ header .logo{width:260px;padding:1em 0}
 			</div>
 		</div>
 	</header>
-	<main class="container login-from mt-3">
-		<div class="alert alert-warning" role="alert">
-			<?php echo $redmsg; ?>
-		</div>
+	<main class="container login-from mt-5">
+		<?php echo $redmsg; ?>
 		<div class="login-area">
-			<h3 class="text-center">后台登录</h3>
+			<h3 class="mb-3 text-center">后台登录</h3>
 			<form name="form1" method="post" action="login.php">
 				<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>">
 				<input type="hidden" name="dopost" value="login">

src/plus/diy.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  *
  * 自定义表单
@@ -11,19 +10,15 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__) . "/../include/common.inc.php");
-
 $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
 $action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post';
 $id = isset($id) && is_numeric($id) ? $id : 0;
-
 if (empty($diyid)) {
     showMsg('非法操作!', 'javascript:;');
     exit();
 }
-
 require_once DEDEINC . '/diyform.cls.php';
 $diy = new diyform($diyid);
-
 /*----------------------------
 function Post(){ }
 ---------------------------*/
@@ -46,11 +41,8 @@ if ($action == 'post') {
             showmsg('自定义表单不存在', '-1');
             exit();
         }
-
         $addvar = $addvalue = '';
-
         if (!empty($dede_fields)) {
-
             $fieldarr = explode(';', $dede_fields);
             if (is_array($fieldarr)) {
                 foreach ($fieldarr as $field) {
@@ -59,34 +51,45 @@ if ($action == 'post') {
                     if ($fieldinfo[1] == 'textdata') {
                         ${$fieldinfo[0]} = FilterSearch(stripslashes(${$fieldinfo[0]}));
                         ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
+                    } 
+                    //获取地址，表单添加text数据类型ip字段型后模板用<input type="hidden" name="ip" value="">
+                    if($fieldinfo[0] == 'ip')
+                    {
+                        ${$fieldinfo[0]}=GetIP();
+                    }
+                    //获取时间，表单添加text数据类型sj字段型后模板用<input type="hidden" name="sj" value="">
+                    if($fieldinfo[0] == 'sj')
+                    {
+                        ${$fieldinfo[0]}=date("Y-m-d H:i");
                     } else {
-                        ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1], 0, 'add', '', 'diy', $fieldinfo[0]);
+                        ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]);
                     }
                     $addvar .= ', `' . $fieldinfo[0] . '`';
                     $addvalue .= ", '" . ${$fieldinfo[0]} . "'";
                 }
             }
         }
-
         $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); ";
-
         if ($dsql->ExecuteNoneQuery($query)) {
             $id = $dsql->GetLastID();
-            if ($diy->public == 2) {
-                //diy.php?action=view&diyid={$diy->diyid}&id=$id
+            if ($diy->public == 2)
+            {
                 $goto = "diy.php?action=list&diyid={$diy->diyid}";
-                $bkmsg = '发布成功，现在转向表单列表页...';
+                $bkmsg = '发布成功，现在转向表单列表页';
             } else {
                 $goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/';
-                $bkmsg = '发布成功，请等待管理员处理...';
+                $bkmsg = '发布成功，请等待管理员处理';
+                //提交后返回提交页面
+                echo"<script>alert('提交成功');history.go(-1)</script>";
             }
-            ShowMsg($bkmsg, $goto);
+            showmsg($bkmsg, $goto);
         }
     }
 }
 /*----------------------------
 function list(){ }
----------------------------*/ else if ($action == 'list') {
+---------------------------*/
+else if ($action == 'list') {
     if (empty($diy->public)) {
         ShowMsg('后台关闭前台浏览', 'javascript:;');
         exit();
@@ -96,7 +99,6 @@ function list(){ }
         $query = "SELECT * FROM `{$diy->table}` ORDER BY id DESC";
     else
         $query = "SELECT * FROM `{$diy->table}` WHERE ifcheck=1 ORDER BY id DESC";
-
     $datalist = new DataListCP();
     $datalist->pageSize = 10;
     $datalist->SetParameter('action', 'list');
@@ -110,7 +112,6 @@ function list(){ }
         showMsg('后台关闭前台浏览', 'javascript:;');
         exit();
     }
-
     if (empty($id)) {
         showMsg('非法操作！未指定id', 'javascript:;');
         exit();
@@ -126,7 +127,6 @@ function list(){ }
         showmsg('你访问的记录不存在或未经审核', '-1');
         exit();
     }
-
     $fieldlist = $diy->getFieldList();
     include DEDEROOT . "/templets/plus/{$diy->viewTemplate}";
-}
+}