Merge branch '1.8.0-dev'

	modified:   src/main/webapp/admin-article.ftl
	modified:   src/main/webapp/css/default-admin.css
	modified:   src/main/webapp/js/admin/article.js

src/main/webapp/admin-article.ftl

@@ -13,7 +13,7 @@
     <div>
         <label>${uploadFileLabel}</label>
         <form id="articleUpload" method="POST" enctype="multipart/form-data">
-            <input type="file" name="file" multiple=""/>
+            <input type="file" name="file" multiple=""/><span></span>
         </form>
     </div>
     <div>

src/main/webapp/css/default-admin.css

@@ -716,6 +716,10 @@ a[class*=" icon-"]:hover {
 /* end comments */
 
 /* start article */
+#articleUpload input {
+    width: 170px;
+}
+
 button#submitArticle,
 #unSubmitArticle {
     background-color: #fa8564;

src/main/webapp/js/admin/article.js

@@ -449,6 +449,8 @@ admin.article = {
                 filename = data.files[0].name;
 
                 data.submit();
+
+                $('#articleUpload span').text('uploading...');
             },
             formData: function (form) {
                 var data = form.serializeArray();
@@ -460,18 +462,18 @@ admin.article = {
                 return data;
             },
             done: function (e, data) {
+                $('#articleUpload span').text('');
                 var qiniuKey = data.result.key;
                 if (!qiniuKey) {
                     alert("Upload error, please check Qiniu configurations");
 
                     return;
                 }
-
-                $('#articleUpload').after('<div id="uploadContent">![' + data.files[0].name + '](http://'
+                $('#articleUpload').after('<div>![' + data.files[0].name + '](http://'
                         + qiniu.qiniuDomain + qiniuKey + ')</div>');
             },
             fail: function (e, data) {
-                alert("Upload error, please check Qiniu configurations [" + data.errorThrown + "]");
+                $('#articleUpload span').text("Upload error, please check Qiniu configurations [" + data.errorThrown + "]");
             }
         }).on('fileuploadprocessalways', function (e, data) {
             var currentFile = data.files[data.index];