From 5368d6755e56327392717f27cea82b948e0c0a90 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 26 Oct 2016 19:11:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8F=AF=E4=BE=9B=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 189 +--------------------- app/views/projects/_no_data.html.erb | 4 + app/views/pull_requests/index.html.erb | 6 +- public/images/new_project/icons_smile.png | Bin 0 -> 24421 bytes public/stylesheets/css/project.css | 6 +- 5 files changed, 11 insertions(+), 194 deletions(-) create mode 100644 app/views/projects/_no_data.html.erb create mode 100644 public/images/new_project/icons_smile.png diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index a7d7711eb..4e43514e8 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -310,7 +310,7 @@ <% end %> <% end %> <% if @issues.empty? %> -

<%= l(:label_no_data) %>

+

<%= l(:label_no_data) %>

<% else %>
<%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %> @@ -331,190 +331,3 @@
- - - - - - - - - - - - - - - - -
-
-
- 新 增 -
- -
- - " id="sendexcel" class="hw_btn_blue fr" alt="导出EXCEL" onclick="remote_function_export('<%= @project.id %>')">导出EXCEL -
- <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> - <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'xls', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> - <%= hidden_field_tag 'set_filter', '1' %> - <%= hidden_field_tag 'export_issue_hidden', '0' %> - -
-
- - -
- 清除 - -
- - - <%= calendar_for('issue_create_date_end_show')%> -
-
- - - <%= calendar_for('issue_create_date_start_show')%> -
- - -
- -
-
    -
  • - 所有 - <%= render :partial => "issues/issue_filter_all" %> -
    • - -
    - - -
- - -
-
- - <%= select(:issue, :tracker, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]), - {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0}, - {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %> - - <%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), - { :include_blank => false,:selected=>@author_id ? @author_id : 0}, - {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"fl "} - ) - %> - - <%= select( :issue, :user_id, principals_options_for_isuue_list(@project), - { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0 - }, - {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"} - ) - %> - <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project), - {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0}, - {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "fl"}) %> - - <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), - { :include_blank => false,:selected=>@status_id ? @status_id : 0 - }, - {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"} - ) - %> - <%#= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), - { :include_blank => false,:selected=>@priority_id ? @priority_id : 0 - }, - {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"fl"} - ) - %> - - <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["100%",10]].unshift(["完成度",0]), - {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 }, - {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %> - <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }).unshift(["完成度",-1]), - {:include_blank => false, :selected => @done_ratio ? @done_ratio : -1}, - {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %> - - - <%#= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]), - {:include_blank => false, :selected => @order ? @order : 0 }, - {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %> - - <%= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]), - {:include_blank => false, :selected => @test ? @test : 0 }, - {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %> - - <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), - { :include_blank => false,:selected=>@author_id ? @author_id : 0}, - {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:style=>"display:none;"} - ) - %> - - - - - - - <%#= select(:issue, :tracker_id, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]), - {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0}, - {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %> - <%#= select( :issue, :user_id, principals_options_for_isuue_list(@project), - { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0}, - {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"}) - %> - - <%#= select(:issue, :fixed_version_id, options_for_version_isuue_list(@project), - {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0}, - {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "f1"}) %> - - <%#= select( :issue, :status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), - { :include_blank => false,:selected=>@status_id ? @status_id : 0 - }, - {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"} - ) %> - - <%#= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }), - {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0}, - {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %> - - <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["10%",10]].unshift(["完成度",0]), - {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 }, - {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %> - - <%#= select(:issue, :test, [["最早创建",1],["最早更新",2]].unshift(["排序",0]), - {:include_blank => false, :selected => @order ? @order : 0 }, - {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %> -
-
-
- <% end %> - <% end %> - <% if @issues.empty? %> -

<%= l(:label_no_data) %>

- <% else %> -
- <%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %> -
- <% end %> - <%#= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %> -
- -
-
diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb new file mode 100644 index 000000000..249a67af0 --- /dev/null +++ b/app/views/projects/_no_data.html.erb @@ -0,0 +1,4 @@ +
+
+

没有数据可供显示！

+
\ No newline at end of file diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb index 6f0061577..2e10d6598 100644 --- a/app/views/pull_requests/index.html.erb +++ b/app/views/pull_requests/index.html.erb @@ -41,10 +41,6 @@ }); <% else %> -
-
- 版本库中还没有提交代码，请先提交代码 -
-
+ <%= render :partial => "projects/no_data" %> <% end %> diff --git a/public/images/new_project/icons_smile.png b/public/images/new_project/icons_smile.png new file mode 100644 index 0000000000000000000000000000000000000000..b760d82fc06de2b728f8e935bcb8e18c0a4e6905 GIT binary patch literal 24421 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 342ac0730..2db68998d 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -1008,4 +1008,8 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co .alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;} .alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;} .close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none; font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;} -.close:hover{opacity: 0.5;} \ No newline at end of file +.close:hover{opacity: 0.5;} + +/* 课程大纲 */ +.icons_tishi{ width: 110px; height: 110px;margin: 135px auto 20px;} +.sy_tab_con_p{ font-size: 16px;text-align: center; margin-bottom:100px; color:#888;} \ No newline at end of file From 0e15ac00be5c1d14c02dd30c4eb50044f6f7058e Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Oct 2016 09:27:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_issue_detail.html.erb | 4 +++- app/views/users/_project_issue_detail.html.erb | 4 +++- public/stylesheets/css/project.css | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_project_issue_detail.html.erb b/app/views/projects/_project_issue_detail.html.erb index 947178cb5..7c7d3f237 100644 --- a/app/views/projects/_project_issue_detail.html.erb +++ b/app/views/projects/_project_issue_detail.html.erb @@ -58,7 +58,9 @@

  •  指派  : 

    - <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %> + <% unless activity.assigned_to.nil? %> + <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %> + <% end %>     <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project), { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0}, diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb index 81df1500b..cb160c3b5 100644 --- a/app/views/users/_project_issue_detail.html.erb +++ b/app/views/users/_project_issue_detail.html.erb @@ -62,7 +62,9 @@

  •  指派  : 

    - <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %> + <% unless activity.assigned_to.nil? %> + <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %> + <% end %> <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project), { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0}, diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 2db68998d..615379597 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -877,6 +877,8 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;} .sy_new_table thead tr td{ border-bottom:1px solid #e5e5e5; font-weight: bold; background-image: linear-gradient(#fcfcfc, #eee);} .sy_new_table tbody tr:hover{ background:#f5f5f5;} .sy_new_table tbody tr td{ height:40px; line-height:40px; border-bottom:1px solid #e5e5e5; color:#888;} +.table-td-w180{display:inline-block;with:180px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} +.table-td-w380{display:inline-block;with:380px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} /*项目简介*/ .pro_new_info{ border:1px solid #ddd; background-color:#fff; width: 998px;} .pro_new_info h2{ background: #eee; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px;} From 2823ea4182d8f24526b88894c0f4a7398f2437d0 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 27 Oct 2016 09:44:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_member_list.html.erb | 2 +- app/views/projects/member.html.erb | 29 +++++------ app/views/projects/watcherlist.html.erb | 52 +++++++++---------- 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb index 7bdac2ba4..eb2573d03 100644 --- a/app/views/projects/_project_member_list.html.erb +++ b/app/views/projects/_project_member_list.html.erb @@ -1,4 +1,4 @@ -
    +
    加入时间
    diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb index 12944e1f5..e24dab160 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -1,17 +1,14 @@ -
    -

    <%= @subPage_title %>

    - <% if is_project_manager?(User.current, @project) %> - - <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %> - - <% end %> +
    +
    +

    <%= @subPage_title %>

    + <% if is_project_manager?(User.current, @project) %> + + <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %> + + <% end %> +
    +
    + <%= error_messages_for 'member' %> + <%= render :partial => @render_file, :locals => {:members => @members} %> +
    -
    - <%= error_messages_for 'member' %> - <%= render :partial => @render_file, :locals => {:members => @members} %> -
    - - - diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index a8a948a11..effef316b 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -1,30 +1,28 @@ -
    -

    <%= l(:label_user_watcher)%>

    -
    -
    -
    - 加入时间 -
    +
    +
    +

    <%= l(:label_user_watcher)%>

    +
    +
    +
    + 加入时间 +
    + + <% for user in @project.watcher_users %> +
    + + <%= user.nil? ? '' : (image_tag(url_to_avatar(user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(user.name, user_path(user),:class => "ml10 c_blue02") %> + <%= format_date(user.created_on) %> +
    +
    + <% end%> + - <% for user in @project.watcher_users %> -
    - - <%= user.nil? ? '' : (image_tag(url_to_avatar(user), :width => 32, :height => 32)) %> - - <%= l(:label_username)%> - <%= link_to(user.name, user_path(user),:class => "ml10 c_blue02") %> - <%= format_date(user.created_on) %> -
    - <% end%> +
    +
    - -
    -
    -
    - -<% html_title(l(:label_followers)) -%> - - \ No newline at end of file + <% html_title(l(:label_followers)) -%> +
    \ No newline at end of file From e3fc304d35c0cd3df9b1594a4bca2c5f8148890c Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 27 Oct 2016 10:06:58 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A0=8F=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_reply_banner.html.erb | 12 +++---- app/views/users/all_journals.js.erb | 4 +++ public/javascripts/application.js | 35 +++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/app/views/projects/_project_reply_banner.html.erb b/app/views/projects/_project_reply_banner.html.erb index 6efbf9fda..682c37a29 100644 --- a/app/views/projects/_project_reply_banner.html.erb +++ b/app/views/projects/_project_reply_banner.html.erb @@ -10,20 +10,16 @@
    <%#= format_date(activity.updated_on) %>
    <%if count>3 %>
    - <% if activity.class.to_s == 'HomeworkCommon' %> - + <% if activity.class.to_s == 'Issue' %> + 展开更多 <% elsif activity.class.to_s == 'Message' %> - - 展开更多 - - <% elsif activity.class.to_s == 'BlogComment' %> - + 展开更多 <% else %> - + 展开更多 <% end %> diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb index 7060a7b1c..03079c96a 100644 --- a/app/views/users/all_journals.js.erb +++ b/app/views/users/all_journals.js.erb @@ -10,4 +10,8 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :p $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'News' || params[:type] == 'Issue' || params[:type] == 'Syllabus' %> $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); +<% elsif params[:type] == 'is_project_issue' %> +$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'projects/project_issue_reply', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); +<% elsif params[:type] == 'is_project_message' %> +$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'projects/project_message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i,:is_course => @is_course, :is_board => @is_board}) %>'); <% end %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index cd28689d6..440a090f9 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1495,6 +1495,41 @@ function expand_reply_homework(container, btnid, id, type, div_id, hw_status, us } } +// 项目中展开 +function expand_reply_project_acts(container, btnid, id, type, div_id, hw_status, user_activity_id) { + var target = $(container); + var btn = $(btnid); + if (btn.data('init') == '0') { + btn.data('init', 1); + $.get( + '/users/all_journals', + { + type: type, + id: id, + div_id: div_id, + hw_status: hw_status, + user_activity_id: user_activity_id + }, + function(data) { + } + ); + btn.html('收起回复'); + //target.show(); + } else if(btn.data('init') == '1') { + btn.data('init', 3); + btn.html('展开更多'); + target.hide(); + target.eq(0).show(); + target.eq(1).show(); + target.eq(2).show(); + } + else { + btn.data('init', 1); + btn.html('收起回复'); + target.show(); + } +} + //by yk 列表描述将文字和起来去掉空格多于100就显示省略号 function description_showwords_ellipsis(id,num){ var str = ""; From 03bfbf777a678e80692ccc08f26f5e9d4afa4cff Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Oct 2016 10:10:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?pull=20request=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/_show.html.erb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index 710ebbfdf..a7dbc91f1 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -25,9 +25,24 @@
    -
    - 在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %> -
    + +<% if @request.state == "merged" %> +
    + 改动已合并至 <%= @request.target_branch %> 分支 +
    +<% else %> + <% if is_project_manager?(User.current.id, @project.id) %> + <% if @request.state == "closed" %> + 该请求已被关闭 + <% else %> +
    + 在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %> +
    + <% end %> + <% end %> +<% end %> + +
      From e035316cc7bf79576f8d4898db49e3b5302946c3 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 27 Oct 2016 10:53:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=EF=BC=8C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93table=E5=AE=BD=E5=BA=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/_new_repositories.html.erb | 12 +++++----- .../projects/settings/_new_versions.html.erb | 22 +++++++++---------- public/stylesheets/css/common.css | 3 +-- 3 files changed, 18 insertions(+), 19 deletions(-) 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;}