From 82c377a60aa1988a562073bb088163e378f617f3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 10 Nov 2015 15:18:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=AF=BC=E8=88=AA=E5=A4=84=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../files/_new_style_attachment_list.html.erb | 82 +++++--------------
 app/views/files/_upload_course_files.erb      |  2 +-
 app/views/layouts/base_projects.html.erb      |  2 +-
 .../_upload_project_files_list.html.erb       | 35 ++++++++
 .../_upload_project_files_on_navbar.html.erb  | 30 +++++++
 public/stylesheets/courses.css                |  4 +-
 public/stylesheets/new_user.css               |  4 +-
 public/stylesheets/project.css                |  4 +-
 8 files changed, 95 insertions(+), 68 deletions(-)
 create mode 100644 app/views/projects/_upload_project_files_list.html.erb
 create mode 100644 app/views/projects/_upload_project_files_on_navbar.html.erb

diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb
index 022486413..af679c4d3 100644
--- a/app/views/files/_new_style_attachment_list.html.erb
+++ b/app/views/files/_new_style_attachment_list.html.erb
@@ -1,71 +1,33 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
 <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
-<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
-<% if @course %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => '_file',
-                       :class => ie8? ? '':'file_selector',
-                       :multiple => true,
-                       :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
-                       :style => ie8? ? '': 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :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)
-                       } %>
-<% else %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => '_file',
-                       :class => ie8? ? '':'file_selector',
-                       :multiple => true,
-                       :onchange => 'addInputFiles(this);',
-                       :style => ie8? ? '': 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :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)
-                       } %>
-<% end %>
-
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "_file#{container.id}",
+                     :class => ie8? ? '':'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :style => ie8? ? '': 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :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)
+                     } %>
+</span>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
 
-<span id="upload_file_count">
+<span id="upload_file_count<%=container.id %>">
       <%= l(:label_no_file_uploaded)%>
     </span>
 (<%= l(:label_max_size) %>:
 <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 <div class="cl"></div>
 <div>
-        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
-<% if defined?(container) && container && container.saved_attachments %>
-  <% container.attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
-      <%= if attachment.id.nil?
-            #待补充代码
-          else
-            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
-          end
-      %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-
-      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
-  <% end %>
-<% end %>
+     <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
 </span>
 </div>
\ No newline at end of file
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 3578d4eb9..9c7021383 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -19,7 +19,7 @@
           </div>
           <div class="cl"></div>
           <div>
-          <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %>
+          <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <div class="cl"></div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index e06db1d0f..d2186118d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -226,7 +226,7 @@
 
       function project_files_upload()
       {
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_show_project',:locals => {:project => @project}) %>');
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>');
           showModal('ajax-modal', '513px');
           $('#ajax-modal').siblings().remove();
           $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb
new file mode 100644
index 000000000..59da30012
--- /dev/null
+++ b/app/views/projects/_upload_project_files_list.html.erb
@@ -0,0 +1,35 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
+<button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{container.id}",
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{container.id}');",
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :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)
+                       } %>
+
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+</span>
+<span id="upload_file_count<%=container.id %>">
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+(<%= l(:label_max_size) %>:
+<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+<div class="cl">
+
+  <div>
+        <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/_upload_project_files_on_navbar.html.erb b/app/views/projects/_upload_project_files_on_navbar.html.erb
new file mode 100644
index 000000000..591e159f1
--- /dev/null
+++ b/app/views/projects/_upload_project_files_on_navbar.html.erb
@@ -0,0 +1,30 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(project_files_path(container), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <input type="hidden" name="in_project_toolbar" value="Y">
+          <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index da4c03398..342833981 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -893,8 +893,8 @@ a.work_list_tit{width:580px;  display:block; overflow:hidden; font-size:14px;  f
 .c_w{ color:#fff;}
 
 .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;}
-#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
-#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+ .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;}
 .evaluation{position: relative;}
 .evaluation_submit{position: absolute;right: 0px;bottom: 0px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2ba5a7374..f21a4b1fd 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1153,8 +1153,8 @@ img.ui-datepicker-trigger {
     text-overflow: ellipsis;
     margin-bottom: 3px;
 }
-#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
-#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+ .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;}
 .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);}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 6a4254046..e7a24b151 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -369,8 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
 .reply_btn:hover{ background:#999; color:#fff; }
-#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
-#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+ .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;}
 .attachments_fields input.description {margin-left:4px; width:100px; }
 .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}