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

app/views/attachments/_form_project.html.erb

@@ -1,4 +1,4 @@
-<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
@@ -38,12 +38,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => "file#{container.id}",
+                     :id => '_file',
                      :class => 'file_selector',
                      :multiple => true,
-                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :onchange => 'addInputFiles(this);',
                      :style => 'display:none',
                      :data => {
                              :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
@@ -56,7 +56,7 @@
                              :file_count => l(:label_file_count),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
-  <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

app/views/files/_project_file_list.html.erb

@@ -22,14 +22,14 @@
           <% if User.current.logged? %>
               <!--私有项目资源部能引用，不能设置公开私有-->
               <!--公开项目资源可以应用，管理员和资源上传者拥有设置公开私有权限-->
-              <% if project.is_public? %>
+              <%# if project.is_public? %>
                 <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
                 <% if (Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") || file.author_id == User.current.id) && project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project" %>
                     <span id="is_public_<%= file.id %>">
                         <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
                     </span>
                 <% end %>
-              <% end %>
+              <%# end %>
           <% end %>
         </div>
         <div class="cl"></div>

app/views/projects/show.html.erb

@@ -40,7 +40,7 @@
               </div>
               <div class="cl"></div>
             </div>
-        <!--jou留言-->
+        <!--缺陷 jou留言 -->
         <% elsif e.forge_act_type == "Journal" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>

app/views/projects/show_new.html.erb

@@ -44,12 +44,7 @@
           <% for tracker in @trackers %>
               <li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
                 <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
-                                                    :total => @total_issues_by_tracker[tr 
-          	<li><%= l(:default_tracker_bug) %></li>
-          <% end %>
-          <% if tracker.[4]%>
-          	<li><%= l(:default_tracker_mission) %></li>
-            <% end %>
+                      :total => @total_issues_by_tracker[tracker].to_i) %>
               </li>
           <% end %>
         </ul>

public/stylesheets/jstoolbar.css

@@ -3,6 +3,7 @@
 }
 .jstEditor textarea, .jstEditor iframe {
     margin: 0;
+    margin-left: 80px;
 }
 
 .jstHandle {