Sfoglia il codice sorgente

修复iOS下无法点击按钮的BUG
优化移动端错误提示

Karson 7 anni fa
parent
commit
4b39ec52f9

+ 6 - 4
application/admin/command/Crud.php

@@ -1158,13 +1158,15 @@ EOD;
         $preview = $uploadfilter ? ' data-preview-id="p-' . $field . '"' : '';
         $previewcontainer = $preview ? '<ul class="row list-inline plupload-preview" id="p-' . $field . '"></ul>' : '';
         return <<<EOD
-<div class="form-inline">
+<div class="input-group">
                 {$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>
-                <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 class="input-group-addon no-border no-padding">
+                    <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>
-               {$previewcontainer}
             </div>
+            {$previewcontainer}
 EOD;
     }
 

+ 7 - 4
application/admin/view/category/add.html

@@ -51,12 +51,15 @@
     <div class="form-group">
         <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="form-inline">
+            <div class="input-group">
                 <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>
-                <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>
-                <ul class="row list-inline plupload-preview" id="p-image"></ul>
+                <div class="input-group-addon no-border no-padding">
+                    <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>
+                    <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>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
         </div>
     </div>
     <div class="form-group">

+ 7 - 4
application/admin/view/category/edit.html

@@ -51,12 +51,15 @@
     <div class="form-group">
         <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="form-inline">
+            <div class="input-group">
                 <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>
-                <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>
-                <ul class="row list-inline plupload-preview" id="p-image"></ul>
+                <div class="input-group-addon no-border no-padding">
+                    <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>
+                    <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>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
         </div>
     </div>
     <div class="form-group">

+ 21 - 2
public/assets/css/backend.css

@@ -463,11 +463,11 @@ table.table-template {
 }
 /*预览区域*/
 .plupload-preview {
-  padding: 10px;
+  padding: 0 10px;
   margin-bottom: 0;
 }
 .plupload-preview li {
-  margin-bottom: 10px;
+  margin-top: 15px;
 }
 .plupload-preview .thumbnail {
   margin-bottom: 10px;
@@ -692,6 +692,9 @@ table.table-template {
     padding-right: 20px;
   }
 }
+.n-bootstrap .input-group > .n-right {
+  position: absolute;
+}
 /*手机版样式*/
 @media (max-width: 480px) {
   .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 > label,
 .checkbox > label {

File diff suppressed because it is too large
+ 1 - 1
public/assets/css/backend.min.css


+ 26 - 2
public/assets/less/backend.less

@@ -495,10 +495,10 @@ table.table-template{
 
 /*预览区域*/
 .plupload-preview {
-    padding:10px;
+    padding:0 10px;
     margin-bottom:0;
     li {
-        margin-bottom:10px;
+        margin-top:15px;
     }
     .thumbnail {
         margin-bottom:10px;
@@ -727,6 +727,12 @@ table.table-template{
     }
 }
 
+.n-bootstrap {
+    .input-group > .n-right {
+        position:absolute;
+    }
+}
+
 /*手机版样式*/
 @media (max-width: @screen-phone) {
     .nav-addtabs {
@@ -741,6 +747,24 @@ table.table-template{
 /*平板样式*/
 @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样式对齐*/