diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 87c19976b..26daa46a2 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -34,16 +34,16 @@ - - - + + + - - - + + +
diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index a67b2f91e..1bd59dcbb 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -11,23 +11,23 @@ - - - - - + + + + + <% @project.shared_versions.each do |version| %> - - - - - + + +
名称结束日期描述状态操作名称结束日期描述状态操作
- <%= 'shared' if version.project != @project %> <%= link_to_version version %> + <%= format_date(version.effective_date) %><%=h version.description %><%= l("version_status_#{version.status}") %> + <%= format_date(version.effective_date) %><%= l("version_status_#{version.status}") %> <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:button_edit), edit_version_path(version, :is_setting => true), :class => 'sy_btn_blue mr5', :remote => true %> <%= delete_link_version version_path(version, :is_setting => true), :class=>"sy_btn_grey mr5", :remote => true %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index b32ba32ae..7ba32756d 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -253,7 +253,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w305{ width:305px;} .w350 {width:350px;} .w362 {width:362px;} -.h400{height: 400px !important;} +.h400{height:400px !important;} .w430{ width:430px;} .W440{ width:440px;} .w450 {width:450px;} @@ -271,7 +271,6 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w607 {width:607px;} .w664{ width:664px;} .w683{ width:683px;} -.w350{ width:350px;} .w610{ width:610px;} .w600{ width:600px !important;} .w603{ width:603px !important;}