Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq

app/helpers/files_helper.rb

@@ -61,7 +61,7 @@ module FilesHelper
     s = ''
     projects.each do |project|
       if !project_contains_attachment?(project,attachment)  && User.current.allowed_to?(:manage_files, project)
-        s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label>"
+        s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label><br/>"
       end
     end
     s.html_safe

app/views/attachments/_project_file_links.html.erb

@@ -59,12 +59,14 @@
       <% end %>
       </p>
   <% end %>
+  <div class="thumbnails">
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>
       <% if images.any? %>
             <% images.each do |attachment| %>
-                <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
+                <div class="pro_pic fl "><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
       <% end %>
   <% end %>
   </div>
+</div>

app/views/files/_project_file_list.html.erb

@@ -45,8 +45,8 @@
         </div>
         <div class="cl"></div>
         <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %>
-          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %>
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>
         <div class="cl"></div>
       </div><!---re_con_box end-->

app/views/files/_show_quote_resource_project.html.erb

@@ -1,6 +1,6 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>将此课件引入我的资源库</h2>
+    <h2>将此文件件引入我的资源库</h2>
     <% if error == '403' %>
         <div class="upload_box">
           <div style="color: red;">您没有权限引用此资源</div>
@@ -13,13 +13,11 @@
                        remote: true,
                        id: "relation_file_form" do %>
               <%= hidden_field_tag(:file_id, file.id) %>
-              <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects')%>
+              <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%>
               <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>
-
-
   </div>
 </div>
 

app/views/issues/_attributes.html.erb

@@ -9,7 +9,8 @@
                 <%= f.select :status_id,
                              (@allowed_statuses.collect { |p| [p.name, p.id] }),
                              {:no_label => true},
-                             :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                             # ajax 刷新
+                             #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
                              :class => "w150" %>
             <% else %>
                 <%= h(@issue.status.name) %>

app/views/issues/update_form.js.erb

@@ -1,5 +1,5 @@
 $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>');
-$(.splitcontent).style("display", "block")
+//$(.splitcontent).style("display", "block")
 <% if User.current.allowed_to?(:log_time, @issue.project) %>
   $('#log_time').show();
 <% else %>

app/views/projects/settings/_new_members.html.erb

@@ -24,7 +24,7 @@
                                       :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
                     ) do |f| %>
             <% roles.each do |role| %>
-                <ul style="text-align: left;" class="m115">
+                <ul class="m120" style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>

app/views/repositories/_breadcrumbs.html.erb

@@ -25,7 +25,7 @@
 <%
    # @rev is revsion or Git and Mercurial branch or tag.
    # For Mercurial *tip*, @rev and @changeset are nil.
-   rev_text = @changeset.nil? ? "master" : format_revision(@changeset)
+   rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
 %>
 <p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p>
 

public/stylesheets/project.css

@@ -534,3 +534,13 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
 .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+
+/*问题跟踪attachment显示*/
+div.attachments { margin-top: 12px; }
+div.attachments p { margin:4px 0 2px 0; }
+div.attachments img { vertical-align: middle; }
+div.attachments span.author { font-size: 0.9em; color: #888; }
+
+div.thumbnails {margin-top:0.6em;}
+div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
+