Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/attachments/_form.html.erb

@@ -62,6 +62,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
     <span id="upload_file_count">

app/views/attachments/_form_course.html.erb

@@ -60,7 +60,9 @@
         :field_is_public => l(:field_is_public),
         :are_you_sure => l(:text_are_you_sure),
         :file_count => l(:label_file_count),
-        :delete_all_files => l(:text_are_you_sure_all)
+        :delete_all_files => l(:text_are_you_sure_all),
+        :lebel_file_uploding => l(:lebel_file_uploding),
+        :containerid => "#{container.id}"
       } %>
   <% if container.nil? %>
     <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>

app/views/attachments/_form_project.html.erb

@@ -60,7 +60,9 @@
                              :field_is_public => l(:field_is_public),
                              :are_you_sure => l(:text_are_you_sure),
                              :file_count => l(:label_file_count),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
                              :delete_all_files => l(:text_are_you_sure_all),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
                              :containerid => "#{container.id}"
                      } %>
   <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>

app/views/attachments/_new_form.html.erb

@@ -42,6 +42,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
     <span id="upload_file_count">

app/views/blog_comments/_blog_attachments.erb

@@ -62,6 +62,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
     <span id="upload_file_count">

app/views/files/_attachement_list.html.erb

@@ -17,6 +17,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
 <% else %>
@@ -35,6 +36,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
 <% end %>

app/views/files/_new_style_attachment_list.html.erb

@@ -16,7 +16,9 @@
                              :field_is_public => l(:field_is_public),
                              :are_you_sure => l(:text_are_you_sure),
                              :file_count => l(:label_file_count),
-                             :delete_all_files => l(:text_are_you_sure_all)
+                             :delete_all_files => l(:text_are_you_sure_all),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
+                             :containerid => "#{container.id}"
                      } %>
 </span>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->

app/views/forums/_file_form.html.erb

@@ -63,6 +63,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
     <!--<span id="upload_file_count">-->

app/views/projects/_upload_project_files_list.html.erb

@@ -16,7 +16,9 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all)
+                               :lebel_file_uploding => l(:lebel_file_uploding),
+                               :delete_all_files => l(:text_are_you_sure_all),
+                               :containerid => "#{container.id}"
                        } %>
 
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->

app/views/student_work/_student_work_attachment_form.html.erb

@@ -19,6 +19,7 @@
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),
                                :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all),
                                :containerid => "#{work.id}"
                        } %>

app/views/users/_attachment_list.html.erb

@@ -18,6 +18,7 @@
                            :field_is_public => l(:field_is_public),
                            :are_you_sure => l(:text_are_you_sure),
                            :file_count => l(:label_file_count),
+                           :lebel_file_uploding => l(:lebel_file_uploding),
                            :delete_all_files => l(:text_are_you_sure_all)
                    } %>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->

app/views/users/_user_homework_attachment.html.erb

@@ -40,6 +40,7 @@
                              :field_is_public => l(:field_is_public),
                              :are_you_sure => l(:text_are_you_sure),
                              :file_count => l(:label_file_count),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
 </div>

config/locales/projects/zh.yml

@@ -183,6 +183,7 @@ zh:
 
   label_optional_description: 可选的描述
   label_file_count: "个文件已上传"
+  lebel_file_uploding: "个文件正在上传"
 
 
   #   

public/javascripts/attachments.js

@@ -178,6 +178,17 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         })
             .done(function(result) {
                 progressSpan.progressbar('value', 100).remove();
+                var containerid = $(inputEl).data('containerid');
+                console.log($(inputEl))
+                if(containerid == undefined ){
+                    var count = $('#attachments_fields>span').length;
+                    $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+                }
+                else{
+                    var count = $('#attachments_fields' + containerid + '>span').length;
+                    $('#upload_file_count' + containerid).html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+                }
+
                 fileSpan.find('input.description, a').css('display', 'inline-block');
                 fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block');
             })
@@ -202,7 +213,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
         var containerid = $(inputEl).data('containerid');
         if (containerid == undefined) {
             var count = $('#attachments_fields>span').length;
-            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+            $('#upload_file_count').html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('lebelFileUploding'));
             if (count >= 1) {
                 var add_attachs = $('.add_attachment');
                 var delete_all = $('.remove_all');
@@ -216,7 +227,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
             }
         } else {
             var count = $('#attachments_fields' + containerid + '>span').length;
-            $('#upload_file_count' + containerid).html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('fileCount'));
+            $('#upload_file_count' + containerid).html("<span id=\"count\">" + count + "</span>" + $(inputEl).data('lebelFileUploding'));
             if (count >= 1) {
                 var add_attachs = $('.add_attachment').filter(function(index) {
                     return $(this).data('containerid') == containerid;
@@ -240,7 +251,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
 
     }
 
-    var progressSpan = $('<div>').insertAfter(fileSpan.find('input.filename'));
+    var progressSpan = $('<div>').insertAfter(fileSpan.find('input.upload_filename'));
     progressSpan.progressbar();
     fileSpan.addClass('ajax-waiting');
 

public/stylesheets/courses.css

@@ -905,7 +905,8 @@ a.work_list_tit{width:580px;  display:block; overflow:hidden; font-size:14px;  f
 .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
  .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
  .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
-.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .evaluation{position: relative;}
 .evaluation_submit{position: absolute;right: 0px;bottom: 0px;}
 .student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }

public/stylesheets/new_user.css

@@ -1155,7 +1155,8 @@ img.ui-datepicker-trigger {
 }
  .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
  .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
-.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;}
 .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);}
 

public/stylesheets/project.css

@@ -371,10 +371,10 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .reply_btn:hover{ background:#999; color:#fff; }
  .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
  .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
-.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .attachments_fields input.description {margin-left:4px; width:100px; }
 .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
-.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 a.remove-upload:hover {text-decoration:none !important;}
 .attachments_fields input.is_public_checkbox {width:20px;}