diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index d8b53acd0..9a65556d8 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -59,12 +59,14 @@ <% end %>

<% end %> +
<% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
<%= thumbnail_issue_tag(attachment) %>
+
<%= thumbnail_issue_tag(attachment) %>
<% end %> <% end %> <% end %> +
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 4ce029217..68bd9f82c 100644 --- a/app/views/issues/_attributes.html.erb +++ b/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) %> diff --git a/app/views/issues/update_form.js.erb b/app/views/issues/update_form.js.erb index 615bbfcb3..cc4fb18fc 100644 --- a/app/views/issues/update_form.js.erb +++ b/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 %> diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb index 780cb47cb..db570d948 100644 --- a/app/views/repositories/_breadcrumbs.html.erb +++ b/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) %>

<%= "@ #{h rev_text}" unless rev_text.blank? %>

diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 1658339ec..0c52ac4a3 100644 --- a/public/stylesheets/project.css +++ b/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;} +