diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb index cf04baa14..bbe16e413 100644 --- a/app/views/issues/_project_issue.html.erb +++ b/app/views/issues/_project_issue.html.erb @@ -10,10 +10,6 @@
<%= activity.subject.to_s %> - <% if activity.journals.count > 0%> - - <%= activity.journals.count %> - <% end %>
@@ -58,7 +54,12 @@
  • <%= activity.fixed_version %>
  • <%= activity.status.name%>
  • <%= activity.done_ratio %>%
  • -
  • +
  • + <% if activity.journals.count > 0%> + + <%= activity.journals.count %> + <% end %> +
    <%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %> <% if !defined?(project_id) && !defined?(user_id) %> <%= link_to "", issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %> @@ -67,8 +68,32 @@ <% elsif defined?(user_id) %> <%= link_to "", issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %> <% end %> +
  • <% end %> + + diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 7da1e671b..81a20b6b1 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -798,8 +798,8 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; } /* 缺陷Tab */ -.issues_con_list{border:1px solid #c8c8c8; } -#issues_list_nav {border-bottom:1px solid #d0d0d0;} +.issues_con_list{border:1px solid #e5e3da; } +#issues_list_nav {border-bottom:1px solid #e5e3da;} #issues_list_nav li {float:left; padding:10px 15px; text-align:center; } #issues_list_nav li a{font-size:12px; color:#444;} .issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; } @@ -816,9 +816,9 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; } -.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;} +.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #e5e3da;} .issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;} -a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } +a.issues_list_title{ color:#444; max-width:300px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } a:hover.issues_list_title{color:#3b94d6;} .issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; } .issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;}