From d97c559e9c3a8a5b31b26c11064b0b5808e63275 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 24 Oct 2016 14:34:54 +0800 Subject: [PATCH] =?UTF-8?q?PULL=20Request=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_pull_request_comments.html.erb | 2 +- .../_pull_request_commits.html.erb | 135 ++++++++---------- app/views/pull_requests/_show.html.erb | 46 +++--- .../pull_requests/pull_request_changes.js.erb | 2 +- .../pull_request_comments.js.erb | 2 +- .../pull_requests/pull_request_commits.js.erb | 2 +- public/stylesheets/css/project.css | 2 +- 7 files changed, 88 insertions(+), 103 deletions(-) diff --git a/app/views/pull_requests/_pull_request_comments.html.erb b/app/views/pull_requests/_pull_request_comments.html.erb index 8b296c733..77dc830dd 100644 --- a/app/views/pull_requests/_pull_request_comments.html.erb +++ b/app/views/pull_requests/_pull_request_comments.html.erb @@ -1,7 +1,7 @@
<%= form_tag(url_for(:controller => 'pull_requests', :action => 'create_pull_request_comment', :project_id => @project.id), :id => 'pull_request_comment_form', :method => "post", :remote => true) do %> - + 留言 <% end %> diff --git a/app/views/pull_requests/_pull_request_commits.html.erb b/app/views/pull_requests/_pull_request_commits.html.erb index d5cd6922b..78b55dc09 100644 --- a/app/views/pull_requests/_pull_request_commits.html.erb +++ b/app/views/pull_requests/_pull_request_commits.html.erb @@ -1,81 +1,60 @@ -
-
-

2016-09-12

-

2个提交

-
-
    -
  • - 19分钟前 - 姚虫虫姚虫虫姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 尹刚 -

    Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

    - acbc94af -
    • -
-
-
-
-

2016-09-12

-

2个提交

-
-
    -
  • - 19分钟前 - 姚虫虫姚虫虫姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 尹刚 -

    Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

    - acbc94af -
    • -
-
-
-
-

2016-09-12

-

2个提交

-
-
    -
  • - 19分钟前 - 姚虫虫姚虫虫姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 姚虫虫 -

    项目导航栏数字错误

    - acbc94af -
    • -
  • - 19分钟前 - 尹刚 -

    Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

    - acbc94af -
    • -
-
+ +
+
+

2016-09-12

+

2个提交

+
+
    +
  • + 19分钟前 + 姚虫虫姚虫虫姚虫虫 +

    项目导航栏数字错误

    + acbc94af +
    • +
  • + 19分钟前 + 姚虫虫 +

    项目导航栏数字错误

    + acbc94af +
    • +
  • + 19分钟前 + 尹刚 +

    Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

    + acbc94af +
    • +
+
+
+
+

2016-09-12

+

2个提交

+
+
    +
  • + 19分钟前 + 姚虫虫姚虫虫姚虫虫 +

    项目导航栏数字错误

    + acbc94af +
    • +
  • + 19分钟前 + 姚虫虫 +

    项目导航栏数字错误

    + acbc94af +
    • +
  • + 19分钟前 + 尹刚 +

    Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

    + acbc94af +
    • +
+
+ + + + diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index ec3e47ef7..0773435cc 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -28,32 +28,32 @@
在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %>接受
-
+
    -
  • - <%= link_to "评论#{@comments_count}".html_safe, pull_request_comments_project_pull_request_path(@request.id, :project_id => @project.id, :type => "1"), :remote => true, :class => "new_roadmap_type_nomal" %> +
  • + <%= link_to "评论#{@comments_count}".html_safe, pull_request_comments_project_pull_request_path(@request.id, :project_id => @project.id, :type => "1"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1" %>
    • -
  • - <%= link_to "提交#{@commits_count}".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => "2"), :remote => true, :class => "new_roadmap_type_nomal" %>
    • +
  • + <%= link_to "提交#{@commits_count}".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => "2"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_2" %>
    • -
  • - <%= link_to "改动#{@changes_count}".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => "3"), :remote => true, :class => "new_roadmap_type_nomal" %>
    • +
  • + <%= link_to "改动#{@changes_count}".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => "3"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_3" %>
<% if @type == nil || @type == "1" %> -
+
<%= render :partial => "pull_requests/pull_request_comments" %>
<% end %> -
+
<%= render :partial => "pull_requests/pull_request_commits" %>
-
+
<%= render :partial => "pull_requests/pull_request_changes" %>
@@ -61,15 +61,21 @@ diff --git a/app/views/pull_requests/pull_request_changes.js.erb b/app/views/pull_requests/pull_request_changes.js.erb index 9021c498d..461cd3d06 100644 --- a/app/views/pull_requests/pull_request_changes.js.erb +++ b/app/views/pull_requests/pull_request_changes.js.erb @@ -1 +1 @@ -$("#merge_record_2").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_changes") %>'); \ No newline at end of file +$("#merge_record_3").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_changes") %>'); \ No newline at end of file diff --git a/app/views/pull_requests/pull_request_comments.js.erb b/app/views/pull_requests/pull_request_comments.js.erb index 5a7e6683c..5fd3c2eb3 100644 --- a/app/views/pull_requests/pull_request_comments.js.erb +++ b/app/views/pull_requests/pull_request_comments.js.erb @@ -1 +1 @@ -$("#merge_record_0").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_comments") %>'); \ No newline at end of file +$("#merge_record_1").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_comments") %>'); \ No newline at end of file diff --git a/app/views/pull_requests/pull_request_commits.js.erb b/app/views/pull_requests/pull_request_commits.js.erb index cc0a82010..764e4660e 100644 --- a/app/views/pull_requests/pull_request_commits.js.erb +++ b/app/views/pull_requests/pull_request_commits.js.erb @@ -1 +1 @@ -$("#merge_record_1").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_commits") %>'); \ No newline at end of file +$("#merge_record_2").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_commits") %>'); \ No newline at end of file diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 8dfd78e92..c4e879b49 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -981,7 +981,7 @@ a.sortdownbtn{background: url(/images/sy/liststyle.png) 0 -12px no-repeat; width .pullreques_blueicon{ background: url(/images/new_project/icons_issue.png) 0 -299px no-repeat; display: inline-block; width: 43px; height: 16px;} .pullreques_greyicon{ background: url(/images/new_project/icons_issue.png) 0 -322px no-repeat; display: inline-block; width: 43px; height: 16px;} .pullreques_greyicon02{ background: url(/images/new_project/icons_issue.png) 0 -344px no-repeat; display: inline-block; width:43px; height: 16px;} -.pullreques_reply_textarea{ width: 100%; padding:0; height: 60px; color: #666;} +.pullreques_reply_textarea{ width: 100%; padding:2; height: 60px; color: #666;} .pullreques_reply_list li{ padding:15px 0; border-top: 1px dashed #ddd; } .pullreques_reply_user_img{ width:50px;height:50px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;} a.pullreques_reply_name{ font-weight: bold; color: #333;}