From 858348298b66ebb25e97d8d417232e3e660fcbf1 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 29 Sep 2016 14:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A0=E8=BD=BD=E6=85=A2?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9C=89=E7=99=BD=E8=89=B2=E5=9D=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/calendars/show.html.erb                | 2 +-
 app/views/gantts/show.html.erb                   | 2 +-
 app/views/layouts/base_projects.html.erb         | 2 +-
 app/views/projects/feedback.html.erb             | 2 +-
 app/views/pull_requests/index.html.erb           | 5 +++--
 app/views/quality_analysis/_result_list.html.erb | 2 +-
 app/views/repositories/show.html.erb             | 2 +-
 app/views/versions/index.html.erb                | 2 +-
 app/views/wiki/edit.html.erb                     | 2 +-
 app/views/wiki/show.html.erb                     | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 05ce3bcac..408a6f8e6 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -36,5 +36,5 @@
 <% html_title(l(:label_calendar)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 759f8c232..d24971be2 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -319,5 +319,5 @@
 <% end %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b0de79d7c..fced40737 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -89,7 +89,7 @@
   </div>
 
 
-  <div id="RSide" class="fl">
+  <div class="fl">
     <%= render_flash_messages %>
     <%= yield %>
     <%= call_hook :view_layouts_base_content %>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index 77f754567..f46b04aee 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -50,5 +50,5 @@ function checkMaxLength() {
 <% html_title(l(:label_project_tool_response)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
\ No newline at end of file
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 2af67293f..1001557ae 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -1,4 +1,4 @@
-<%= render :partial => "pull_requests/pull_request_container" %>
+<%#= render :partial => "pull_requests/pull_request_container" %>
 <ul id="mergeBanner" class="project-merge-banner">
   <li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
   <li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
@@ -16,7 +16,8 @@
 
 
 <script>
-    $("#mergeBanner").parent().css("width","730px");
+    $("#mergeBanner").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
+    $("#mergeBanner").parent().before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
 
     $(".project-merge-banner li").click(function(){
         $(".project-merge-banner li").removeClass("active");
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index f4cd55c5f..b22a4f05a 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -36,7 +36,7 @@
 <% end %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
 
 
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index b12302e6e..2f6d53c8c 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -94,5 +94,5 @@
 <% html_title(l(:label_repository)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 3a3740a23..ee940f342 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -74,5 +74,5 @@
 <%= context_menu issues_context_menu_path %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 83b1d18ae..a14cc01c1 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -68,5 +68,5 @@
 <% html_title @page.pretty_title %>
 
 <script>
-    $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 995c44924..bd9a0dc90 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -95,6 +95,6 @@
         });
     };
 
-        $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
 </div>
\ No newline at end of file