From 32da582b0a114465c34826e67dd7d6258d2775d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/templets/album_add.htm | 10 + src/admin/templets/album_edit.htm | 9 +- src/admin/templets/archives_add.htm | 4 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/archives_sg_add.htm | 6 +- src/admin/templets/archives_sg_edit.htm | 2 +- src/admin/templets/article_add.htm | 6 +- src/admin/templets/article_edit.htm | 4 +- src/admin/templets/soft_add.htm | 7 +- src/admin/templets/soft_edit.htm | 4 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 7 + src/static/web/css/admin.css | 341 +++++++++++------------ src/static/web/css/style.css | 54 ++-- src/static/web/js/enums.js | 20 +- src/static/web/js/user.album.js | 2 +- src/system/customfields.func.php | 50 ++-- src/theme/system/custom_fields_admin.htm | 2 +- src/theme/templet-filelist.inc | 11 +- src/user/templets/album_add.htm | 4 +- src/user/templets/album_edit.htm | 6 +- src/user/templets/edit_baseinfo.htm | 2 +- src/user/templets/soft_add.htm | 2 +- src/user/templets/soft_edit.htm | 6 +- 24 files changed, 299 insertions(+), 264 deletions(-) diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 9e003389..ea28a0b8 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -25,6 +25,16 @@ var swfu = null; var vcc = 0; var albums = []; + function checkSubmit() { + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); + return false; + } + if (document.form1.typeid.value == 0) { + ShowMsg("请选择文档栏目"); + return false; + } + } </script> </head> <body> diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index dbeed907..eb68bc05 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -25,6 +25,13 @@ var swfu = null; var vcc = 0; var albums = []; + function checkSubmit() { + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); + document.form1.title.focus(); + return false; + } + } </script> </head> <body> @@ -294,7 +301,7 @@ $fhtml .= "<input type='hidden' name='imgddurl{$j}' value='{$litimg}'>"; $fhtml .= "<img src='{$litimg}' id='lit{$j}'>"; $fhtml .= "<div class='my-2'>标题:<input type='text' name='imgmsg{$j}' value='".$ctag->GetAtt('text')."' class='admin-input-sm'></div>"; - $fhtml .= "<div><span class='btn btn-success btn-sm fileinput-button'>更换<input for='item{$j}' type='file' name='imgfile{$j}'></span><a href=\"javascript:delAlbPicOld('$bigimg',$j)\" class=\"btn btn-success btn-sm\">删除</a></div>"; + $fhtml .= "<div><span class='btn btn-success btn-sm fileinput-button'>更换<input type='file' name='imgfile{$j}' for='item{$j}' class='btnEdit'></span><a href=\"javascript:delAlbPicOld('$bigimg',$j)\" class=\"btn btn-success btn-sm\">删除</a></div>"; $fhtml .= "</div>"; echo $fhtml; $j++; diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 763f7964..ece09cf5 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -21,11 +21,11 @@ <script> function checkSubmit() { if (document.form1.title.value == "") { - ShowMsg("<?php echo $cInfos['titlename'];?>不能为空"); + ShowMsg("请输入文档标题"); return false; } if (document.form1.typeid.value == 0) { - ShowMsg("请选择文档的主栏目"); + ShowMsg("请选择文档栏目"); return false; } } diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 0fb5cab8..8438f94e 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -21,7 +21,7 @@ <script> function checkSubmit() { if (document.form1.title.value == "") { - ShowMsg("<?php echo $cInfos['titlename'];?>不能为空"); + ShowMsg("请输入文档标题"); document.form1.title.focus(); return false; } diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index 7df2cbf2..e65d3b0f 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -21,11 +21,11 @@ <script> function checkSubmit() { if (document.form1.title.value == "") { - ShowMsg("<?php echo $cInfos['titlename'];?>不能为空"); + ShowMsg("请输入文档标题"); return false; } - if (document.form1.typeid.value==0) { - ShowMsg("请选择文档的主栏目"); + if (document.form1.typeid.value == 0) { + ShowMsg("请选择文档栏目"); return false; } } diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 133ad413..d3c95711 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -21,7 +21,7 @@ <script> function checkSubmit() { if (document.form1.title.value == "") { - ShowMsg("<?php echo $cInfos['titlename'];?>不能为空"); + ShowMsg("请输入文档标题"); document.form1.title.focus(); return false; } diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 00f90aee..a54112ff 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -22,12 +22,12 @@ <script> var arctype = 'article'; function checkSubmit() { - if (document.form1.title.value == '') { - ShowMsg('文档标题不能为空'); + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择文档的主栏目'); + ShowMsg("请选择文档栏目"); return false; } } diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 9be03345..2c3b488f 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -23,8 +23,8 @@ var swfu = null; var arctype = 'article'; function checkSubmit() { - if (document.form1.title.value == '') { - ShowMsg('文档标题不能为空'); + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); document.form1.title.focus(); return false; } diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 149aeb21..5321003a 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -20,13 +20,12 @@ <style>table{border-collapse:inherit}</style> <script> function checkSubmit() { - if (document.form1.title.value == '') { - ShowMsg('软件名称不能为空'); - document.form1.title.focus(); + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择文档的主栏目'); + ShowMsg("请选择文档栏目"); return false; } } diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 91f62563..12cabd6b 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -20,8 +20,8 @@ <style>table{border-collapse:inherit}</style> <script> function checkSubmit() { - if (document.form1.title.value == '') { - ShowMsg('软件名称不能为空'); + if (document.form1.title.value == "") { + ShowMsg("请输入文档标题"); document.form1.title.focus(); return false; } diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index b9c5de66..3dd01927 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -21,7 +21,7 @@ <script> function checkSubmit() { if (document.form1.title.value == "") { - ShowMsg("专题名称不能为空"); + ShowMsg("请输入专题标题"); return false; } for (i = 1; i <= 6; i++) { diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index a0f4f3ba..20728799 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -19,6 +19,13 @@ <script src="../static/web/js/cropper.min.js"></script> <style>table{border-collapse:inherit}</style> <script> + function checkSubmit() { + if (document.form1.title.value == "") { + ShowMsg("请输入专题标题"); + document.form1.title.focus(); + return false; + } + } function SelectTemplets(fname) { var pos = GetWinPos(800,600); window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 279a9271..74775d93 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -28,17 +28,15 @@ a:hover { color:#ec982c; text-decoration:none } -h1,h2,h3,ul,ol,div,form { +h1,h2,h3,div,form,ul,ol,li,dd { margin:0; padding:0 } -td,th,div { +div,th,td { word-break:break-all; word-wrap:break-word } -li,dd { - margin:0; - padding:0; +li { list-style:none } img { @@ -77,182 +75,30 @@ input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkb outline:none; vertical-align:text-top } -textarea { +select { padding:.25rem .65rem; + height:28px; color:#545b62; background:#fff; border:1px solid #dee2e6; border-radius:.2rem; transition:all .3s } -select { +textarea { padding:.25rem .65rem; - height:28px; color:#545b62; background:#fff; border:1px solid #dee2e6; border-radius:.2rem; transition:all .3s } -select:focus,input:focus,textarea:focus { +input:focus,select:focus,textarea:focus { color:#495057; background:#fff; border-color:#80bdff; box-shadow:0 0 0 0.2rem rgba(0,123,255,.25); outline:0 } -.coolbg { - padding:.25rem .65rem; - background:#f5f5f5; - border-bottom:1px solid #dee2e6; - border-radius:.2rem; - border:0; - cursor:pointer -} -.coolbg2 { - height:28px; - background:#dfddd2; - border:1px solid #dee2e6 -} -.coolbt { - background:#e4f7d7; - border-left:1px solid #efefef; - border-top:1px solid #efefef; - border-bottom:1px solid #acacac; - cursor:pointer -} -.coolbt2 { - background:#f7fcda; - border-left:1px solid #efefef; - border-top:1px solid #efefef; - border-bottom:1px solid #acacac -} -.coolbg3 { - width:140px; - height:28px; - background:#dfddd2; - border:1px solid #bdc5b4; - text-align:right -} -.coolbg61 { - width:390px; - height:28px; - line-height:28px; - background:#e7f3b1; - border-top:1px solid #bdc5b4; - border-left:1px solid #bdc5b4; - border-right:1px solid #bdc5b4; - text-align:right -} -.coolbg62 { - padding:.6rem; - width:390px; - height:300px; - background:#F8FDF0; - border:1px solid #bdc5b4 -} -.coolbg4 { - width:160px; - background:#fff; - border-bottom:1px solid #dee2e6; - text-align:right -} -.wsselect { - padding:.65rem 0; - background:#fff; - overflow:auto -} -.pubdlg { - background:#fff; - border:2px solid #1eb867; - border-radius:.2rem; - z-index:8888 -} -.pubdlg .title { - padding-left:.65rem; - line-height:30px; - font-weight:600; - color:#545b62; - background:#f5f5f5; - border-bottom:1px solid #dee2e6 -} -.fullpagediv { - position:absolute; - top:0; - left:0; - width:100%; - height:100%; - background:#cdcdcd; - opacity:.6; - z-index:1999 -} -.quicksel { - margin-left:10px; - margin-top:10px; - width:680px; - height:420px; - overflow:auto; - z-index:10005 -} -.quickselfoot { - padding:.65rem 0; - border-top:1px solid #dee2e6 -} -.quickselItem { - display:block; - line-height:28px -} -.quickselItem .topcat { - padding:0 10px; - background:#e9ecef; - clear:both -} -.quickselItem .soncat { - padding:0 10px -} -.quickselItem .item { - display:inline-block; - padding-left:10px -} -.mysource,.mywriter { - width:300px; - background:#fff; - border:2px solid #1eb867; - z-index:10001 -} -.dlgws div { - padding:.65rem; - width:100% -} -#uploadfield { - float:left -} -#uploadwait { - z-index:19999 -} -.option1 { - background:#e9ecef -} -.option2 { - background:#adb5bd -} -.option3 { - background:#fff -} -.divpre img { - max-width:150px; - max-height:100px -} -.divpre { - overflow:hidden -} -.colordlg { - padding:.6rem; - width:120px; - background:#fff; - border:2px solid #1eb867; - z-index:10005 -} body.hidemenu { background:none } @@ -500,14 +346,162 @@ span.page-link { color:#fff; background:#1eb867 } +.coolbg { + padding:.25rem .65rem; + background:#f5f5f5; + border-bottom:1px solid #dee2e6; + border-radius:.2rem; + border:0; + cursor:pointer +} +.coolbg2 { + height:28px; + background:#dfddd2; + border:1px solid #dee2e6 +} +.coolbt { + background:#e4f7d7; + border-left:1px solid #efefef; + border-top:1px solid #efefef; + border-bottom:1px solid #acacac; + cursor:pointer +} +.coolbt2 { + background:#f7fcda; + border-left:1px solid #efefef; + border-top:1px solid #efefef; + border-bottom:1px solid #acacac +} +.coolbg3 { + width:140px; + height:28px; + background:#dfddd2; + border:1px solid #bdc5b4; + text-align:right +} +.coolbg61 { + width:390px; + height:28px; + line-height:28px; + background:#e7f3b1; + border-top:1px solid #bdc5b4; + border-left:1px solid #bdc5b4; + border-right:1px solid #bdc5b4; + text-align:right +} +.coolbg62 { + padding:.6rem; + width:390px; + height:300px; + background:#F8FDF0; + border:1px solid #bdc5b4 +} +.coolbg4 { + width:160px; + background:#fff; + border-bottom:1px solid #dee2e6; + text-align:right +} +.wsselect { + padding:.65rem 0; + background:#fff; + overflow:auto +} +.pubdlg { + background:#fff; + border:2px solid #1eb867; + border-radius:.2rem; + z-index:8888 +} +.pubdlg .title { + padding-left:.65rem; + line-height:30px; + font-weight:600; + color:#545b62; + background:#f5f5f5; + border-bottom:1px solid #dee2e6 +} +.fullpagediv { + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + background:#cdcdcd; + opacity:.6; + z-index:1999 +} +.quicksel { + margin-left:10px; + margin-top:10px; + width:680px; + height:420px; + overflow:auto; + z-index:10005 +} +.quickselfoot { + padding:.65rem 0; + border-top:1px solid #dee2e6 +} +.quickselItem { + display:block; + line-height:28px +} +.quickselItem .topcat { + padding:0 10px; + background:#e9ecef; + clear:both +} +.quickselItem .soncat { + padding:0 10px +} +.quickselItem .item { + display:inline-block; + padding-left:10px +} +.mysource,.mywriter { + width:300px; + background:#fff; + border:2px solid #1eb867; + z-index:10001 +} +.dlgws div { + padding:.65rem; + width:100% +} +#uploadfield { + float:left +} +#uploadwait { + z-index:19999 +} +.option1 { + background:#e9ecef +} +.option2 { + background:#adb5bd +} +.option3 { + background:#fff +} +.divpre img { + max-width:150px; + max-height:100px +} +.divpre { + overflow:hidden +} +.colordlg { + padding:.6rem; + width:120px; + background:#fff; + border:2px solid #1eb867; + z-index:10005 +} .maintable { width:98%!important; border:1px solid #dee2e6!important } -.form-control { - display:inline-block; - margin-right:10px -} .table { margin-bottom:0; color:#545b62 @@ -516,6 +510,14 @@ span.page-link { padding:.65rem; vertical-align:middle } +.form-control { + display:inline-block +} +.fa { + font-size:14px!important; + color:inherit; + cursor:pointer +} .btn-xs { padding:2px; line-height:12px; @@ -524,11 +526,6 @@ span.page-link { .btn+.btn,.btn-text+.btn-text { margin-left:10px } -.fa { - font-size:14px!important; - color:inherit; - cursor:pointer -} .admin-win { background:#f5f5f5; border:1px solid #dee2e6 @@ -595,9 +592,9 @@ span.page-link { border-radius:.2rem } .fileinput-button { + display:inline-block; position:relative; - overflow:hidden; - display:inline-block + overflow:hidden } .fileinput-button input { position:absolute; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index bd344002..1cb7762e 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -291,23 +291,6 @@ input[type=file] { .logo img { height:40px } -.table { - color:#545b62 -} -.form-control,.btn,.fa { - font-size:14px!important -} -.form-control,.input-text { - height:36px; - line-height:36px -} -.fa { - color:inherit; - cursor:pointer -} -.btn+.btn,.btn-text+.btn-text { - margin-left:10px -} .login-from { margin:6rem 0 } @@ -369,10 +352,47 @@ input[type=file] { padding:1.5rem; background:#fff } +.table { + color:#545b62 +} +.form-control { + display:inline-block +} +.fa { + color:inherit; + cursor:pointer +} +.btn+.btn,.btn-text+.btn-text { + margin-left:10px +} +.form-control,.btn,.fa { + font-size:14px!important +} +.form-control,.input-text { + height:36px; + line-height:36px +} .thumbnail-md { max-width:280px; max-height:168px } +.admin-textarea-xl { + width:100%; + height:90px +} +.admin-textarea-sm { + width:360px; + height:50px +} +.admin-input-md { + width:90% +} +.admin-input-sm { + width:160px +} +.admin-input-xs { + width:60px +} #btnScrollTop { display:none; position:fixed; diff --git a/src/static/web/js/enums.js b/src/static/web/js/enums.js index bc498251..ed2518f1 100644 --- a/src/static/web/js/enums.js +++ b/src/static/web/js/enums.js @@ -34,13 +34,13 @@ function ChangeSon() { //由于支持3级联动,所以这里需要对自己改变进行重构 var emname = this.name.replace('_son', ''); - if ( document.getElementById(emname+'_sec') ) { + if (document.getElementById(emname+'_sec')) { var oj = document.getElementById(emname + '_sec'); } else { var oj = document.createElement('select'); oj.name = emname + '_sec'; oj.id = emname + '_sec'; - oj.className = "form-control"; + oj.className = "form-control admin-input-sm mr-2"; oj.onchange = ChangeSec; } var v = this.options[this.selectedIndex].value; @@ -92,13 +92,13 @@ function ChangeSec() function selNextSon() { var emname = this.name.replace('_top', ''); - if ( document.getElementById(emname+'_son') ) { + if (document.getElementById(emname+'_son')) { var oj = document.getElementById(emname + '_son'); } else { var oj = document.createElement('select'); oj.name = emname + '_son'; oj.id = emname + '_son'; - oj.className = "form-control"; + oj.className = "form-control admin-input-sm mr-2"; oj.onchange = ChangeSon; } var v = this.options[this.selectedIndex].value; @@ -139,7 +139,7 @@ function MakeTopSelect(emname, selvalue) var selObj = document.createElement("select"); selObj.name = emname + '_top'; selObj.id = emname + '_top'; - selObj.className = "form-control"; + selObj.className = "form-control admin-input-sm mr-2"; selObj.onchange = selNextSon; var selarr = eval('em_'+emname+'s'); var topvalue = 0; @@ -153,8 +153,7 @@ function MakeTopSelect(emname, selvalue) topvalue = selvalue; } //如果是小数,则依次取出顶级数值,二级数值以及三级数值 - else if (!!(selvalue % 1)) - { + else if (!!(selvalue % 1)) { secvalue = selvalue; sonvalue = Math.floor(selvalue); topvalue = sonvalue - (sonvalue % 500); @@ -184,15 +183,14 @@ function MakeTopSelect(emname, selvalue) selObj = document.createElement("select"); selObj.name = emname + '_son'; selObj.id = emname + '_son'; - selObj.className = "form-control"; + selObj.className = "form-control admin-input-sm mr-2"; selObj.onchange = ChangeSon; aOption = document.createElement('OPTION'); aOption.text = '请选择..'; aOption.value = 0; selObj.options.add(aOption); //当大类有值输出子类 - if (topvalue > 0) - { + if (topvalue > 0) { var selv = topvalue; var maxv = parseInt(topvalue) + 500; for (i = selv + 1; i < maxv; i++) { @@ -221,7 +219,7 @@ function MakeTopSelect(emname, selvalue) selObj.onchange = ChangeSec; aOption = document.createElement('OPTION'); aOption.text = '请选择..'; - selObj.className = "form-control"; + selObj.className = "form-control admin-input-sm mr-2"; aOption.value = 0; selObj.options.add(aOption); var selv = sonvalue; diff --git a/src/static/web/js/user.album.js b/src/static/web/js/user.album.js index 92b86cc4..0c07277b 100644 --- a/src/static/web/js/user.album.js +++ b/src/static/web/js/user.album.js @@ -42,7 +42,7 @@ function MakeUpload(mnum) fhtml = ''; fhtml += "<div><label><input type='checkbox' name='isokcheck"+startNum+"' id='isokcheck"+startNum+"' value='1' "+dsel+" onClick='CheckSelTable("+startNum+")'> 显示图片"+startNum+"上传框</label></div>"; fhtml += "<div id=\"seltb"+startNum+"\" style=\""+dplay+"\">"; - fhtml += "<p>图片"+startNum+":<input type='text' name='imgfile"+startNum+"' class='form-control d-inline-block w-50 mr-2' placeholder='请输入网址'></p>"; + fhtml += "<p>图片"+startNum+":<input type='text' name='imgfile"+startNum+"' class='form-control w-50 mr-2' placeholder='请输入网址'></p>"; fhtml += "<p>图片简介:<textarea name='imgmsg"+startNum+"' class='form-control'></textarea></p>"; fhtml += "</div>"; upfield.innerHTML += fhtml; diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php index 3622e622..367d7cf8 100755 --- a/src/system/customfields.func.php +++ b/src/system/customfields.func.php @@ -28,7 +28,7 @@ function GetFormItem($ctag, $admintype = 'admin') if ($fieldType == 'select') { $myformItem = ''; $items = explode(',', $ctag->GetAtt("default")); - $myformItem = "<select name='$fieldname' class='admin-input-sm'>"; + $myformItem = "<select name='$fieldname' class='form-control admin-input-sm'>"; foreach ($items as $v) { $v = trim($v); if ($v != '') { @@ -41,7 +41,7 @@ function GetFormItem($ctag, $admintype = 'admin') global $hasSetEnumJs, $cfg_cmspath; $cmspath = ((empty($cfg_cmspath) || !preg_match('/[/$]/', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath); $myformItem = ''; - $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='0' />"; + $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='0'>"; $myformItem .= "<span id='span_{$fieldname}'></span>"; $myformItem .= "<span id='span_{$fieldname}_son'></span>"; $myformItem .= "<span id='span_{$fieldname}_sec'></span>"; @@ -102,33 +102,32 @@ function GetFormItem($ctag, $admintype = 'admin') $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'></textarea>"; } else if ($fieldType == "datetime") { $nowtime = GetDateTimeMk(time()); - $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" class=\"form-control admin-input-md\" />"; + $innertext = "<input type=\"text\" name=\"$fieldname\" value=\"$nowtime\" id=\"$fieldname\" class=\"form-control admin-input-md\">"; } else if ($fieldType == 'img' || $fieldType == 'imgfile') { if ($admintype == 'diy') { - $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='admin-input-md' />"; + $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='form-control admin-input-md'>"; } else { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\" />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">"; } } else if ($fieldType == 'media') { if ($admintype == 'diy') { - $innertext = "<input type='hidden' name='$fieldname' id='$fieldname' value='' /> 不支持的类型"; + $innertext = "<input type='hidden' name='$fieldname' id='$fieldname' value=''> 不支持类型"; } else { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectMedia('form1.$fieldname')\" />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectMedia('form1.$fieldname')\">"; } } else if ($fieldType == 'addon') { if ($admintype == 'diy') { - $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='admin-input-md' />"; + $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='form-control admin-input-md'>"; } else { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\" />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\">"; } } else if ($fieldType == 'int' || $fieldType == 'float') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0'); - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$dfvalue' />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$dfvalue'>"; } else if ($fieldType == 'relation') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : ''); $channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel'); - $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$dfvalue</textarea><br> - <button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"form1.$fieldname\", $channel);'>选择关联文档</button>"; + $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$dfvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"form1.$fieldname\", $channel);'>选择关联文档</button>"; if ($ctag->GetAtt('automake') == 1) { $innertext .= "<input type='hidden' name='automake[$fieldname]' value='1'>"; } @@ -145,7 +144,7 @@ if (typeof SelectArcList === "undefined") { EOT; } else { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : ''); - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' value='$dfvalue' /> + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' value='$dfvalue'> "; } $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); @@ -311,7 +310,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $items = explode(',', $ctag->GetAtt('default')); } if ($ftype == 'select') { - $myformItem = "<select name='$fieldname' class='admin-input-sm'>"; + $myformItem = "<select name='$fieldname' class='form-control admin-input-sm'>"; if (is_array($items)) { foreach ($items as $v) { $v = trim($v); @@ -327,7 +326,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') global $hasSetEnumJs, $cfg_cmspath; $cmspath = ((empty($cfg_cmspath) || preg_match('/[/$]/', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath); $myformItem = ''; - $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='{$fvalue}' />"; + $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='{$fvalue}'>"; $myformItem .= "<span id='span_{$fieldname}'></span>"; $myformItem .= "<span id='span_{$fieldname}_son'></span>"; $myformItem .= "<span id='span_{$fieldname}_sec'></span>"; @@ -389,9 +388,9 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $okfvalue = ''; } if ($admintype == 'admin') { - $myformItem = GetEditor($fieldname, $okfvalue, 360, 'Basic', 'string')." <input type='hidden' name='{$fieldname}_file' value='{$fvalue}' /> "; + $myformItem = GetEditor($fieldname, $okfvalue, 360, 'Basic', 'string')." <input type='hidden' name='{$fieldname}_file' value='{$fvalue}'> "; } else { - $myformItem = GetEditor($fieldname, $okfvalue, 360, 'Member', 'string')." <input type='hidden' name='{$fieldname}_file' value='{$fvalue}' /> "; + $myformItem = GetEditor($fieldname, $okfvalue, 360, 'Member', 'string')." <input type='hidden' name='{$fieldname}_file' value='{$fvalue}'> "; } $innertext = $myformItem; } else if ($ftype == "htmltext") { @@ -405,7 +404,7 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea>"; } else if ($ftype == "datetime") { $nowtime = GetDateTimeMk($fvalue); - $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" class=\"form-control admin-input-md\" />"; + $innertext = "<input type=\"text\" name=\"$fieldname\" value=\"$nowtime\" id=\"$fieldname\" class=\"form-control admin-input-md\">"; } else if ($ftype == "img") { $ndtp = new DedeTagParse(); $ndtp->LoadSource($fvalue); @@ -416,19 +415,18 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') $ntag = $ndtp->GetTag("img"); $fvalue = trim($ntag->GetInnerText()); } - $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\" />"; + $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">"; } else if ($ftype == "imgfile") { - $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\" />"; + $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">"; } else if ($ftype == "media") { - $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('form1.$fieldname')\" />"; + $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('form1.$fieldname')\">"; } else if ($ftype == "addon") { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md' /> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\" />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\">"; } else if ($ftype == "int" || $ftype == "float") { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue' />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue'>"; } else if ($ftype == "relation") { $channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel'); - $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br> - <button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"form1.$fieldname\", $channel);'>选择关联文档</button>"; + $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"form1.$fieldname\", $channel);'>选择关联文档</button>"; if ($ctag->GetAtt('automake') == 1) { $innertext .= "<input type='hidden' name='automake[$fieldname]' value='1'>"; } @@ -444,7 +442,7 @@ if (typeof SelectArcList === "undefined") { </script> EOT; } else { - $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' value='$fvalue' />"; + $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' value='$fvalue'>"; } $formitem = str_replace('~name~', $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace('~form~', $innertext, $formitem); diff --git a/src/theme/system/custom_fields_admin.htm b/src/theme/system/custom_fields_admin.htm index 774b255a..ae8e0c5d 100644 --- a/src/theme/system/custom_fields_admin.htm +++ b/src/theme/system/custom_fields_admin.htm @@ -1,6 +1,6 @@ <table width="100%" cellspacing="0" cellpadding="0"> <tr> - <td width="90" class="admin-td"> ~name~:</td> + <td width="90" class="admin-td">~name~:</td> <td class="admin-td">~form~</td> </tr> </table> \ No newline at end of file diff --git a/src/theme/templet-filelist.inc b/src/theme/templet-filelist.inc index 03749611..0bf732ec 100644 --- a/src/theme/templet-filelist.inc +++ b/src/theme/templet-filelist.inc @@ -1,7 +1,7 @@ advancedsearch.htm,高级搜索模板 article_article.htm,文档模板 -article_default.htm,自定义文档模板 -article_default_sg.htm,自定义表单文档模板 +article_default.htm,默认文档模板 +article_default_sg.htm,默认表单文档模板 article_image.htm,图片文档模板 article_infos.htm,分类文档模板 article_soft.htm,软件文档模板 @@ -17,14 +17,13 @@ index_infos.htm,分类封面模板 index_soft.htm,软件封面模板 list_article.htm,文档列表模板 list_default.htm,默认列表模板 -list_default_sg.htm,默认列表表单模板 +list_default_sg.htm,默认表单列表模板 list_free.htm,自由列表模板 list_image.htm,图片列表模板 list_infos.htm,分类列表模板 list_soft.htm,软件列表模板 list_spec.htm,专题列表模板 -list_shop.htm,商城列表模板 search.htm,搜索模板 +top.htm,顶部模板 tag.htm,标签首页模板 -taglist.htm,标签文档列表模板 -top.htm,顶部模板 \ No newline at end of file +taglist.htm,标签文档列表模板 \ No newline at end of file diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 3d825d26..a22e6a6b 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -78,10 +78,10 @@ <label><input type="radio" name="pagestyle" id="pagestyle1" onclick="checkMuList()" value="1" <?php if ($cfg_album_style==1) echo " checked='checked'";?>> 多页多图显示(适用于表情等)</label> <label><input type="radio" name="pagestyle" id="pagestyle2" onclick="checkMuList()" value="2" <?php if ($cfg_album_style==2) echo " checked='checked'";?>> 多页单图显示(幻灯)</label> <label><input type="radio" name="pagestyle" id="pagestyle3" onclick="checkMuList()" value="3" <?php if ($cfg_album_style==3) echo " checked='checked'";?>> 多行多列显示(缩略图)</label> - <div id="spagelist" style="display:none">每页图片数:<input name="pagpicnum" id="pagpicnum" class="form-control d-inline-block w-25" value="<?php echo $cfg_album_pagesize;?>"></div> + <div id="spagelist" style="display:none">每页图片数:<input name="pagpicnum" id="pagpicnum" class="form-control w-25" value="<?php echo $cfg_album_pagesize;?>"></div> </div> <div class="form-group"> - <span>图片数目:<input type="text" name="picnum" value="5" id="picnum" class="form-control d-inline-block w-25"></span> + <span>图片数目:<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25"></span> <button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">增加</button>(最大60幅) </div> <div id="uploadfield"></div> diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 2cfb11ef..c73ff992 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -81,10 +81,10 @@ <label><input type="radio" name="pagestyle" id="pagestyle1" onclick="checkMuList()" value="1" <?php if ($cfg_album_style==1) echo " checked='checked'";?>> 多页多图显示(适用于表情等)</label> <label><input type="radio" name="pagestyle" id="pagestyle2" onclick="checkMuList()" value="2" <?php if ($cfg_album_style==2) echo " checked='checked'";?>> 多页单图显示(幻灯)</label> <label><input type="radio" name="pagestyle" id="pagestyle3" onclick="checkMuList()" value="3" <?php if ($cfg_album_style==3) echo " checked='checked'";?>> 多行多列显示(缩略图)</label> - <div id="spagelist" style="<?php if ($abinfo->GetAtt('value')!=2) echo 'display:none';?>">每页图片数:<input name="pagpicnum" id="pagpicnum" class="form-control d-inline-block w-25" value="<?php echo $abinfo->GetAtt('pagpicnum');?>"></div> + <div id="spagelist" style="<?php if ($abinfo->GetAtt('value')!=2) echo 'display:none';?>">每页图片数:<input name="pagpicnum" id="pagpicnum" class="form-control w-25" value="<?php echo $abinfo->GetAtt('pagpicnum');?>"></div> </div> <div class="form-group"> - <span>图片数目:<input type="text" name="picnum" value="5" id="picnum" class="form-control d-inline-block w-25 mr-2"></span> + <span>图片数目:<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25 mr-2"></span> <button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">增加</button>(最大60幅) </div> <div id="uploadfield"></div> @@ -97,7 +97,7 @@ ?> <div><label><input type="checkbox" name="isokcheck<?php echo $j;?>" id="isokcheck<?php echo $j;?>" value="1" onclick="CheckSelTable(<?php echo $j;?>)" checked="1"> 显示隐藏图片<?php echo $j;?>选框</label></div> <div id="seltb<?php echo $j;?>"> - <p>本地上传:<input type="text" name="imgfile<?php echo $j;?>" class="form-control d-inline-block w-50 mr-2" placeholder="请输入网址"><span class="btn btn-success btn-sm">选择</span></p> + <p>本地上传:<input type="text" name="imgfile<?php echo $j;?>" class="form-control w-50 mr-2" placeholder="请输入网址"><span class="btn btn-success btn-sm">选择</span></p> <p> <div id="divpicview<?php echo $j;?>" class="divpre"></div> <img src="<?php echo trim($ctag->GetInnerText());?>" id="picview<?php echo $j;?>" name="picview<?php echo $j;?>"> diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 1700210c..fa76fbd1 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -59,7 +59,7 @@ </div> <div class="form-group row"> <label for="iptUname" class="col-sm-3 col-form-label">昵称:</label> - <div class="col-sm-9"><input type="text" name="uname" class="form-control d-inline-block w-75" id="iptUname" value="<?php echo $row['uname'];?>" placeholder="企业会员为公司名,个人会员为昵称"></div> + <div class="col-sm-9"><input type="text" name="uname" class="form-control w-75" id="iptUname" value="<?php echo $row['uname'];?>" placeholder="企业会员为公司名,个人会员为昵称"></div> </div> <div class="form-group row"> <label class="col-sm-3 col-form-label">修改头像:</label> diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index cf3764ab..bf02a4e6 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -179,7 +179,7 @@ </div> <div class="form-group"> <label>其它地址:</label> - <input type="text" name="picnum" id="picnum" value="5" class="form-control d-inline-block w-25 mr-2"> + <input type="text" name="picnum" id="picnum" value="5" class="form-control w-25 mr-2"> <button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">增加地址</button> <button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>(最多为12个链接) </div> diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 2173cb60..0a08285b 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -17,7 +17,7 @@ morelinkobj.style.display = "block"; if (endNum > 12) endNum = 12; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "<p>下载地址" + startNum + ":<input type='text' name='softurl" + startNum + "' value='http://' class='form-control d-inline-block w-50'></p>"; + upfield.innerHTML += "<p>下载地址" + startNum + ":<input type='text' name='softurl" + startNum + "' value='http://' class='form-control w-50'></p>"; upfield.innerHTML += "<p>下载名称" + startNum + ":<input type='text' name='servermsg" + startNum + "' class='form-control'></p>"; } } @@ -177,12 +177,12 @@ </div> </div> <div class="form-group"> - <p>下载地址:<input type="text" name="softurl1" id="softurl1" class="form-control d-inline-block w-50"></p> + <p>下载地址:<input type="text" name="softurl1" id="softurl1" class="form-control w-50"></p> <p>下载名称:<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="下载"></p> </div> <div class="form-group"> <label>其它地址:</label> - <input type="text" name="picnum" id="picnum" value="5" class="form-control d-inline-block w-25"> + <input type="text" name="picnum" id="picnum" value="5" class="form-control w-25"> <button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">增加地址</button> <button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button> (最多为12个链接) </div>