|
- <div id="create_pull_request_error">
- <%= render :partial => "pull_requests/error_message" %>
- </div>
-
- <!--PullReques开始-->
- <div class="new_roadmap_conbox mb10" >
- <div class="new_roadmap_info_top clear ">
- <%= link_to "返回合并请求列表<span class='new_roadmap_icons_back mr5'></span>".html_safe, project_pull_requests_path(@project), :class => "fl linkBlue2 mt3" %>
- <span class="ml5 mr5 fl f14">|</span><h4 class="fl new_roadmap_listtitle"><%= @request.title %> </h4><span class="fl <%= pr_status_css(@request.state) %> mt3 ml5"></span>
- <% if User.current.login == @request.author.try(:username) || is_project_manager?(User.current.id, @project.id) %>
- <% unless @request.state == "merged" %>
- <%= link_to "#{@request.state == 'closed' ? '重新打开' : '关闭'}", update_pull_request_project_pull_request_path(@request.id, :project_id => @project.id, :state => @request.state =="closed" ? "reopen" : "close"), :class => "fr c_grey" %>
- <% end %>
- <% end %>
- <!--<a href="javascript:void(0);" class=" fr c_grey mr10" >编辑</a>-->
- </div>
- <div class="clear new_roadmap_listbox">
- <div class="c_grey02 mb10">
- <p><%= @request.description %></p>
- </div>
- <div class="c_grey clear mt5">
- <p class="fl">由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "linkBlue2" %>于 <%= format_time(@request.created_at) %> 创建</p>
- <span class="fl ml10">最近更新:<%= format_time(@request.updated_at) %></span>
- <p class="fr">
- <%= find_gitlab_project(@request.source_project_id)+"/"+@request.source_branch %><span class="c_grey02 ml10 mr10">合并到</span><%= find_gitlab_project(@request.target_project_id)+"/"+@request.target_branch %>
-
- </p>
- </div>
- </div>
- </div>
-
- <% if @request.state == "merged" %>
- <div class="alert alert-orange mb15 ">
- 改动已合并至 <%= @request.target_branch %> 分支
- </div>
- <% else %>
- <%= render "show_container" %>
- <% end %>
-
-
- <div class="new_roadmap_conbox mb10" >
- <div class=" clear">
- <ul class="new_roadmap_nav fl" >
- <li class="new_roadmap_nav_hover" id="new_roadmap_nav_1" onclick="HoverLi(1);">
- <%= link_to "评论<span class='new_roadmap_nav_taghover ml5' id='new_roadmap_num_1'>#{@comments_count}</span>".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" %>
- </li>
- <li id="new_roadmap_nav_2" onclick="HoverLi(2);">
- <%= link_to "提交<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_2'>#{@commits_count}</span>".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" %></li>
- </li>
- <li id="new_roadmap_nav_3" onclick="HoverLi(3);">
- <%= link_to "改动<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@changes_count}</span>".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" %></li>
- </li>
- </ul>
- </div>
-
-
- <% if @type == nil || @type == "1" %>
- <div id="merge_record_1">
- <%= render :partial => "pull_requests/pull_request_comments" %>
- </div>
- <% end %>
- <div id="merge_record_2" class="undis">
- <%= render :partial => "pull_requests/pull_request_commits" %>
- </div>
- <div id="merge_record_3" class="undis">
- <%= render :partial => "pull_requests/pull_request_changes" %>
- </div>
-
- </div>
- <!--PullReques结束-->
-
- <script>
- function g(o){
- return document.getElementById(o);
- }
- function HoverLi(n){
- //如果有N个标签,就将i<=N;
- for(var i=1;i<=3;i++){
- g('new_roadmap_nav_'+i).className='new_roadmap_nav_nomal';
- g('new_roadmap_type_'+i).className='new_roadmap_type_nomal';
- g('new_roadmap_num_'+i).className='new_roadmap_nav_tagnomal';
- g('merge_record_'+i).className='undis';
- }
- g('new_roadmap_nav_'+n).className='new_roadmap_nav_hover';
- g('new_roadmap_type_'+n).className='new_roadmap_type_hover';
- g('new_roadmap_num_'+n).className='new_roadmap_nav_taghover';
- g('merge_record_'+n).className='dis';
- }
- </script>
|