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

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

This commit is contained in:
huang 2016-10-26 14:55:04 +08:00
parent 95eab901a9 5a45ac2af6
commit 7b3b49d874
8 changed files with 70 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -14,7 +14,7 @@ class PullRequestsController < ApplicationController
# project_menu_type 为了控制base顶部导航 # project_menu_type 为了控制base顶部导航
@project_menu_type = 6 @project_menu_type = 6
# 不符合pullrequest条件的给出提示 # 不符合pullrequest条件的给出提示
@allow_to_pull_request = allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0 @allow_to_pull_request = allow_pull_request(@project) > 0
type = params[:type] type = params[:type]
case type case type

3
app/controllers/repositories_controller.rb
View File

@ -380,8 +380,7 @@ update
# 顶部导航 # 顶部导航
@project_menu_type = 5 @project_menu_type = 5
## TODO: the below will move to filter, done. # TODO: the below will move to filter, done.
# 获取版本库目录结构 # 获取版本库目录结构
@entries = @repository.entries(@path, @rev) @entries = @repository.entries(@path, @rev)
if request.xhr? if request.xhr?

6
app/helpers/application_helper.rb
View File

@ -902,12 +902,6 @@ module ApplicationHelper
atts.count > 0 ? true :false atts.count > 0 ? true :false
end end
# 如果Pull Request数量为0就显示在更多中
def allow_show_pull_request project
g = Gitlab.client
count = g.merge_requests(project.gpid).count
end
# 必须是项目成员，项目必须提交过代码 # 必须是项目成员，项目必须提交过代码
def allow_pull_request project def allow_pull_request project
return 0 if project.gpid.nil? return 0 if project.gpid.nil?

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

@ -47,11 +47,13 @@
</li> </li>
<% end %> <% end %>
<!--Pull Request--> <!--Pull Request-->
<li id="project_menu_06"> <% unless @project.gpid.nil? %>
<%= link_to project_score.pull_request_num >0 ? "Pull Requests <span class='issues_nav_tag ml5'>#{switch_integer_into_k project_score.pull_request_num}</span>".html_safe : "Pull Requests", project_pull_requests_path(@project), :class => "pro_new_proname", :title => "#{project_score.pull_request_num}" %> <li id="project_menu_06">
<% if project_score.pull_request_num >0 %> <%= link_to project_score.pull_request_num >0 ? "Pull Requests <span class='issues_nav_tag ml5'>#{switch_integer_into_k project_score.pull_request_num}</span>".html_safe : "Pull Requests", project_pull_requests_path(@project), :class => "pro_new_proname", :title => "#{project_score.pull_request_num}" %>
<% end %> <% if project_score.pull_request_num >0 %>
</li> <% end %>
</li>
<% end %>
<!--里程碑--> <!--里程碑-->
<li id="project_menu_07"> <li id="project_menu_07">
<%= link_to @project.versions.count >0 ? "#{l(:label_roadmap)}<span class='issues_nav_tag ml5'>#{switch_integer_into_k @project.versions.count}</span>".html_safe : l(:label_roadmap) ,project_roadmap_path(@project), :class => "pro_new_proname" %> <%= link_to @project.versions.count >0 ? "#{l(:label_roadmap)}<span class='issues_nav_tag ml5'>#{switch_integer_into_k @project.versions.count}</span>".html_safe : l(:label_roadmap) ,project_roadmap_path(@project), :class => "pro_new_proname" %>

6
app/views/pull_requests/index.html.erb
View File

@ -41,6 +41,10 @@
}); });
</script> </script>
<% else %> <% else %>
<p>不符合条件，内容待补充</p> <div class="new_roadmap_conbox mb10" >
<div class="new_roadmap_navbox clear">
版本库中还没有提交代码，请先提交代码
</div>
</div>
<% end %> <% end %>

9
app/views/pull_requests/new.html.erb
View File

@ -15,14 +15,5 @@
$("#changed-files-detail").hide(); $("#changed-files-detail").hide();
}); });
$(".merge-record li a").click(function(){
$(".merge-record li a").removeClass("active");
$(this).addClass("active");
var index = $(".merge-record li a").index(this);
$("#merge_record_0, #merge_record_1").hide();
$("#merge_record_" + index).show();
});
</script> </script>

110
app/views/repositories/commit_diff.html.erb
View File

@ -1,59 +1,57 @@
<div class="project_r_h" style="width:730px;"> <div class="container-big">
<div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div> <div class="project_r_h" style="width:970px;">
</div> <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
<!--<script>--> </div>
<!--// $(document).ready(function(){--> <!--<script>-->
<!--// $("#changed-files").click(function(){--> <!--// $(document).ready(function(){-->
<!--// $("#changed-files-detail").toggle();--> <!--// $("#changed-files").click(function(){-->
<!--// });--> <!--// $("#changed-files-detail").toggle();-->
<!--// });--> <!--// });-->
<!--</script>--> <!--// });-->
<div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3"> <!--</script>-->
<%= @commit_details.id %></a><br /> <div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3">
<li class="commit js-toggle-container"> <%= @commit_details.id %></a><br />
<%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> <li class="commit js-toggle-container">
</li> <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
</div> </li>
<div class="showing-changes-project f14"><%= @commit_details.message %></div> </div>
<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>--> <div class="showing-changes-project f14"><%= @commit_details.message %></div>
<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>-->
<!--<ol class="mt10" id="changed-files-detail">--> <!--<ol class="mt10" id="changed-files-detail">-->
<!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>--> <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>-->
<!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>--> <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>-->
<!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>--> <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>-->
<!--</ol>--> <!--</ol>-->
<!--</div>--> <!--</div>-->
<% @commit_diff.each do |cd| %> <% @commit_diff.each do |cd| %>
<div class="showing-changes-row fontGrey2"> <div class="showing-changes-row fontGrey2">
<a href="javascript:void()" class="linkGrey3" id="changed-files"> <a href="javascript:void()" class="linkGrey3" id="changed-files">
<img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %> <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %>
</a> </a>
</div> </div>
<div class="autoscroll"> <div class="autoscroll">
<table class="filecontent syntaxhl" style="width:100%;" > <table class="filecontent syntaxhl" style="width:100%;" >
<tbody> <tbody>
<% line_num = diff_line_num(cd.diff) %> <% line_num = diff_line_num(cd.diff) %>
<% diff_content = diff_content(cd.diff) %> <% diff_content = diff_content(cd.diff) %>
<% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %> <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
<tr> <tr>
<th class="line-num" id="L<%= line_num %>" style="vertical-align: top;"> <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
<a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a> <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
</th> </th>
<% if line[0,1] == "-" %> <% if line[0,1] == "-" %>
<td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td> <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<% elsif line[0,1] == "+" %> <% elsif line[0,1] == "+" %>
<td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td> <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<% else%> <% else%>
<td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td> <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<% end %> <% end %>
</tr> </tr>
<% line_num += 1 %> <% line_num += 1 %>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div> </div>
<% end %> <% end %>
</div>
<script>
$(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
</script>

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

@ -400,8 +400,8 @@ tr.open span.expander {background-image: url(/images/bullet_toggle_minus.png);}
/*版本库diff*/ /*版本库diff*/
.showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;} .showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;}
.showing-changes-project {width:710px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} .showing-changes-project {padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
.showing-changes-row {width:710px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} .showing-changes-row {padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
#changed-files-detail {display:none;} #changed-files-detail {display:none;}
#changed-files-detail li {list-style-type:disc; margin-left:15px;} #changed-files-detail li {list-style-type:disc; margin-left:15px;}
.showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} .showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}