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

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>

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>

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 %>

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>

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");

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>
 
 

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>

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>

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>

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>

public/stylesheets/css/project.css

@@ -564,7 +564,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .sy_class_infobox{
     padding:15px;
     background:#fff;
-    margin:12px auto 0;
+    margin:0px auto ;
     width:968px;
     border:1px solid #e5e5e5;
     position: relative;