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

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

This commit is contained in:
huang 2016-08-02 16:34:31 +08:00
parent 3ce1ac80b4 09f25588a8
commit 56a444dac0
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
<li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">关闭<span class="project-number-dot">1</span></a></li>
<li class="active"><a href="javascript:void(0);">全部<span class="project-number-dot">3</span></a></li>
<a href="javascript:void(0);" class="BlueCirBtn fr ml10 mt10">新建请求</a>
<div class="cl"></div>
</ul>
<div class="cl"></div>

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

@ -11,7 +11,7 @@
<li><a href="javascript:void(0);">改动<span class="project-number-dot">1</span></a></li>
</ul>
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
<div class="new-merge-wrap" id="merge-record-1">
<div class="new-merge-wrap" id="merge_record_0">
<div class="merge-commit-time">
<img width="16" class="ui-datepicker-trigger mr15" style="cursor:default; margin-top:3px; margin-left:0;" /><span class="fontGrey3">2016-08-02</span>
<p class="mt10 fontGrey2">1次提交</p>
@ -26,16 +26,16 @@
</div>
<div class="cl"></div>
</div>
<div id="merge-record-2">
<div class="showing-changes-row fontGrey2" style="width:710px;">Showing <a href="javascript:void(0)" class="linkGrey3 fb" id="changed-files">3 changed files</a> with <span class="c_green fb">3 additions</span> and <span class="c_red fb">3 deletions</span>
<div id="merge_record_1" class="undis">
<div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;">Showing <a href="javascript:void(0)" class="linkGrey3 fb" id="changed-files">3 changed files</a> with <span class="c_green fb">3 additions</span> and <span class="c_red fb">3 deletions</span>
<ol class="mt10" id="changed-files-detail">
<li><a href="javascript:void(0)" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>
<li><a href="javascript:void(0)" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>
<li><a href="javascript:void(0)" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>
<li><a href="javascript:void(0)" class="linkGrey3">app/views/organizations/_org_course_homework.html.erb</a> </li>
<li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_course_homework.html.erb</a> </li>
<li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_user_homework_detail.html.erb</a> </li>
</ol>
</div>
<div class="showing-changes-row fontGrey2" style="width:710px;"><a href="javascript:void(0)" class="linkGrey3" id="changed-files"><img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" />app/views/organizations/_org_course_homework.html.erb</a></div>
<div class="showing-changes-detail" style="width:730px;">
<div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;"><a href="javascript:void(0)" class="linkGrey3"><img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" />app/views/organizations/_org_course_homework.html.erb</a></div>
<div class="showing-changes-detail" style="width:750px; margin:0 -10px;">
<table class="changes-detail-chart">
<tr>
<td class="diff-line-number fontGrey2">99</td>
@ -63,4 +63,20 @@
<script>
$("#new-merge-request").parent().css("width","730px");
$("#changed-files").toggle(function(){
$("#changed-files-detail").show();
},function(){
$("#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>