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

app/views/pull_requests/_pull_request_commits.html.erb

@@ -1,9 +1,10 @@
+<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
 <% @commits.each do |commit| %>
  <div class="new-merge-wrap">
     <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"><%= format_date(commit.created_at) %></span>
       <!--<p class="mt10 fontGrey2">1次提交</p>-->
-      <p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %>创建于<%= time_tag(commit.created_at) %>前</p>
+      <p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %> 创建于<%= time_tag(commit.created_at) %>前</p>
     </div>
     <div class="merge-commit-detail">
       <span class="fontGrey3 fb"><%= commit.title %></span>

app/views/pull_requests/_show.html.erb

@@ -4,7 +4,7 @@
 
 <div id="pull_request_show">
   <div id="mergeShow" class="f14 fontGrey2 merge-show">
-    <span class="mr10 open-status"><%= get_state(@request.state) %></span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
+    <span class="mr10 open-status"><%= get_state(@request.state) %></span><span class="mr10">合并请求</span>   由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %> 于 <%= time_tag(@request.created_at) %> 前提交 · 最后编辑时间 <%= time_tag(@request.updated_at) %> 前
     <% 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 => "BlueCirBtn fr" %>
   <% end %>
@@ -36,14 +36,30 @@
 
   </div>
         <ul class="merge-record" style="border-top:1px solid #ddd;">
-          <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
+          <li><%= link_to "留言<span class='project-number-dot'>#{@commits_count}</span>".html_safe, :class => "active" %></li>
+          <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true %></li>
           <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
         </ul>
-        <div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
         <div id="merge_record_0">
-          <%= render :partial => "pull_requests/pull_request_commits" %>
+          <div class="merge-discussion-content">
+            <a href="javascript:void(0);" class="link-blue mr15 fl">Hjqreturn</a><span class="fl fontGrey2">20小时前</span>
+            <div class="cl"></div>
+            <div class="merge-discussion-detail">回复内容</div>
+          </div>
+          <div class="merge-discussion-content merge-discussion-automatic">
+            <a href="javascript:void(0);" class="link-blue mr15 fl">Hjqreturn</a><span class="fl fontGrey2">20小时前</span>
+            <div class="cl"></div>
+            <div class="merge-discussion-detail">已关闭请求/重新审核请求</div>
+          </div>
+          <div class="merge-discussion-input">
+            <textarea></textarea>
+            <a href="javascript:void(0);" class="BlueCirBtn">提 交</a>
+          </div>
         </div>
         <div id="merge_record_1" class="undis">
+          <%= render :partial => "pull_requests/pull_request_commits" %>
+        </div>
+        <div id="merge_record_2" class="undis">
           <%= render :partial => "pull_requests/pull_request_changes" %>
         </div>
     <% end %>
@@ -53,19 +69,13 @@
 <script>
     $("#pull_request_show").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_0, #merge_record_1, #merge_record_2").hide();
         $("#merge_record_" + index).show();
     });
 </script>

public/stylesheets/css/project.css

@@ -540,4 +540,9 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .merge-commit-code {width:150px; float:left; text-align:right;}
 .merge-show {margin:-10px -10px 0 -10px; padding:10px; line-height:36px; border-bottom:1px solid #ddd;}
 .open-status {color:#fff; padding:0 16px; background-color:#3b94d6; border-radius:2px; display:inline-block;}
-.merge-commit-option {padding:12px; border:1px solid #ddd; background-color:#f9f9f9; border-radius:2px;}
+.merge-commit-option {padding:12px; border:1px solid #ddd; background-color:#f9f9f9; border-radius:2px;}
+.merge-discussion-content {font-size:13px; color: #484848; margin:0 -10px; padding:10px; border-bottom:1px solid #ddd;}
+.merge-discussion-detail {font-size:13px; line-height:1.5em; color:#484848; margin-top:10px;}
+.merge-discussion-automatic {background-color:#fdfdfd;}
+.merge-discussion-input {margin:0 -10px; padding:10px; background-color:#f8f8f8;}
+.merge-discussion-input textarea {width:720px; height:80px; font-size:13px; line-height:16px; color:#484848; margin-bottom:10px; padding:5px;}

public/stylesheets/css/structure.css

@@ -474,6 +474,7 @@ a.f_grey:hover {color:#000000;}
 .shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:last-child {border-bottom:none;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}