jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果

This commit is contained in:
daiao 2016-11-25 11:32:45 +08:00
parent 599d233176
commit bff5a36577
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -227,7 +227,7 @@ class PullRequestsController < ApplicationController
# Gets the comments on a merge request. # Gets the comments on a merge request.
# #
# @example # @example
# Gitlab.merge_request_comments(5, 1) # Gitlab.merge_request_comments(5, 1)
def pull_request_comments def pull_request_comments
begin begin
@comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse

4
app/views/layouts/_base_project_top.html.erb
View File

@ -19,8 +19,8 @@
<div class="cl"></div> <div class="cl"></div>
<% unless @project.forked_from_project_id.nil? %> <% unless @project.forked_from_project_id.nil? %>
<div class="fl pro_new_name ml15 clear mt5"> <div class="fl pro_new_name ml15 clear mt5">
<span class="vl_fork fl mr5 mt2">forked from</span> <%=link_to "#{get_fork_from_project(@project.forked_from_project_id).owner.try(:show_name)}<span class='ml5 mr5'>/</span>".html_safe, user_path(get_fork_from_project(@project.forked_from_project_id).owner), :class => "pro_new_username_fork fl" %> <span class="vl_fork fl mr5 mt2">forked from</span> <%=link_to "#{get_fork_from_project(@project.forked_from_project_id).owner.try(:show_name)}<span class='ml5 mr5'>/</span>".html_safe, user_path(get_fork_from_project(@project.forked_from_project_id).owner), :class => "pro_new_username_fork fl", :target => "_blank" %>
<%=link_to get_fork_from_project(@project.forked_from_project_id).name, project_path(get_fork_from_project(@project.forked_from_project_id)), :class => "pro_new_username_fork fl" %> <%=link_to get_fork_from_project(@project.forked_from_project_id).name, project_path(get_fork_from_project(@project.forked_from_project_id)), :class => "pro_new_username_fork fl", :target => "_blank" %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% end %> <% end %>

10
app/views/pull_requests/_show.html.erb
View File

@ -31,15 +31,7 @@
改动已合并至 <%= @request.target_branch %> 分支 改动已合并至 <%= @request.target_branch %> 分支
</div> </div>
<% else %> <% else %>
<% if is_project_manager?(User.current.id, @project.id) %> <%= render "show_container" %>
<% if @request.state == "closed" %>
该请求已被关闭
<% else %>
<div class="alert alert-orange mb15 ">
在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
</div>
<% end %>
<% end %>
<% end %> <% end %>

11
app/views/pull_requests/_show_container.html.erb Normal file
View File

@ -0,0 +1,11 @@
<% if @request.state == "closed" %>
该请求已被关闭
<% elsif @commits_count == 0 %>
项目分支 <%= @request.source_branch %> 和 <%= @request.target_branch %> 似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支
<% else %>
<% if is_project_manager?(User.current.id, @project.id) %>
<div class="alert alert-orange mb15 ">
在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
</div>
<% end %>
<% end %>

4
public/stylesheets/css/project.css
View File

@ -860,8 +860,8 @@ input.pro_newissue_con_check{ width: 15px; height: 15px;}
.pro_new_top {padding-top:15px; border:1px solid #ddd; background-color:#fff; width: 998px;} .pro_new_top {padding-top:15px; border:1px solid #ddd; background-color:#fff; width: 998px;}
.icons_newpro_lock{width: 22px; height: 23px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -113px no-repeat;} .icons_newpro_lock{width: 22px; height: 23px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -113px no-repeat;}
.pro_new_name{width: 600px; } .pro_new_name{width: 600px; }
a.pro_new_username { font-size: 20px; color: #3b94d6; line-height: 24px; cursor: default;} a.pro_new_username { font-size: 20px; color: #3b94d6; line-height: 24px;}
a.pro_new_username_fork { font-size: 12px; color: #3b94d6; line-height: 24px; cursor: default;} a.pro_new_username_fork { font-size: 12px; color: #3b94d6; line-height: 24px;}
a.pro_new_proname{ overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;} a.pro_new_proname{ overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
a.pro_new_project_name{ width: 250px; overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;} a.pro_new_project_name{ width: 250px; overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
a.pro_new_topbtn{ padding: 3px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;} a.pro_new_topbtn{ padding: 3px 7px; font-size: 12px; line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd; border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;}