hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复iOS下无法点击按钮的BUG 

优化移动端错误提示
pull/18/head
Karson 2017-09-20 14:53:57 +08:00
parent 23f4fb1b8c
commit 4b39ec52f9
6 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/admin/command/Crud.php
View File

@ -1158,13 +1158,15 @@ EOD;
$preview = $uploadfilter ? ' data-preview-id="p-' . $field . '"' : ''; $preview = $uploadfilter ? ' data-preview-id="p-' . $field . '"' : '';
$previewcontainer = $preview ? '<ul class="row list-inline plupload-preview" id="p-' . $field . '"></ul>' : ''; $previewcontainer = $preview ? '<ul class="row list-inline plupload-preview" id="p-' . $field . '"></ul>' : '';
return <<<EOD return <<<EOD
<div class="form-inline"> <div class="input-group">
{$content} {$content}
<span><button type="button" id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"{$uploadfilter}{$multiple}{$preview}><i class="fa fa-upload"></i> {:__('Upload')}</button></span> <div class="input-group-addon no-border no-padding">
<span><button type="button" id="fachoose-{$field}" class="btn btn-primary fachoose" data-input-id="c-{$field}"{$selectfilter}{$multiple}><i class="fa fa-list"></i> {:__('Choose')}</button></span> <span><button type="button" id="plupload-{$field}" class="btn btn-danger plupload" data-input-id="c-{$field}"{$uploadfilter}{$multiple}{$preview}><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-{$field}" class="btn btn-primary fachoose" data-input-id="c-{$field}"{$selectfilter}{$multiple}><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right" for="c-{$field}"></span> <span class="msg-box n-right" for="c-{$field}"></span>
{$previewcontainer}
</div> </div>
{$previewcontainer}
EOD; EOD;
} }

11
application/admin/view/category/add.html
View File

@ -51,12 +51,15 @@
<div class="form-group"> <div class="form-group">
<label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label> <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="form-inline"> <div class="input-group">
<input id="c-image" class="form-control" size="50" name="row[image]" type="text" value=""> <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="">
<span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> <div class="input-group-addon no-border no-padding">
<span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span> <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<ul class="row list-inline plupload-preview" id="p-image"></ul> <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div> </div>
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

11
application/admin/view/category/edit.html
View File

@ -51,12 +51,15 @@
<div class="form-group"> <div class="form-group">
<label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label> <label for="c-image" class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="form-inline"> <div class="input-group">
<input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image}"> <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image}">
<span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/*" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> <div class="input-group-addon no-border no-padding">
<span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span> <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<ul class="row list-inline plupload-preview" id="p-image"></ul> <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div> </div>
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

23
public/assets/css/backend.css
View File

@ -463,11 +463,11 @@ table.table-template {
} }
/*预览区域*/ /*预览区域*/
.plupload-preview { .plupload-preview {
padding: 10px; padding: 0 10px;
margin-bottom: 0; margin-bottom: 0;
} }
.plupload-preview li { .plupload-preview li {
margin-bottom: 10px; margin-top: 15px;
} }
.plupload-preview .thumbnail { .plupload-preview .thumbnail {
margin-bottom: 10px; margin-bottom: 10px;
@ -692,6 +692,9 @@ table.table-template {
padding-right: 20px; padding-right: 20px;
} }
} }
.n-bootstrap .input-group > .n-right {
position: absolute;
}
/*手机版样式*/ /*手机版样式*/
@media (max-width: 480px) { @media (max-width: 480px) {
.nav-addtabs { .nav-addtabs {
@ -702,6 +705,22 @@ table.table-template {
} }
} }
/*平板样式*/ /*平板样式*/
@media (max-width: 768px) {
.n-bootstrap .n-right {
margin-top: 0;
top: -20px;
position: absolute;
left: 0;
text-align: right;
width: 100%;
}
.n-bootstrap .n-right .msg-wrap {
position: relative;
}
.n-bootstrap .col-xs-12 > .n-right .msg-wrap {
margin-right: 15px;
}
}
/*修复radio和checkbox样式对齐*/ /*修复radio和checkbox样式对齐*/
.radio > label, .radio > label,
.checkbox > label { .checkbox > label {

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
public/assets/less/backend.less
View File

@ -495,10 +495,10 @@ table.table-template{
/*预览区域*/ /*预览区域*/
.plupload-preview { .plupload-preview {
padding:10px; padding:0 10px;
margin-bottom:0; margin-bottom:0;
li { li {
margin-bottom:10px; margin-top:15px;
} }
.thumbnail { .thumbnail {
margin-bottom:10px; margin-bottom:10px;
@ -727,6 +727,12 @@ table.table-template{
} }
} }
.n-bootstrap {
.input-group > .n-right {
position:absolute;
}
}
/*手机版样式*/ /*手机版样式*/
@media (max-width: @screen-phone) { @media (max-width: @screen-phone) {
.nav-addtabs { .nav-addtabs {
@ -741,6 +747,24 @@ table.table-template{
/*平板样式*/ /*平板样式*/
@media (max-width: @screen-tablet) { @media (max-width: @screen-tablet) {
.n-bootstrap {
.n-right {
margin-top:0;
top:-20px;
position:absolute;
left:0;
text-align:right;
width:100%;
.msg-wrap {
position:relative;
}
}
.col-xs-12 > .n-right {
.msg-wrap {
margin-right:15px;
}
}
}
} }
/*修复radio和checkbox样式对齐*/ /*修复radio和checkbox样式对齐*/