Merge branch 'rep_quality' into develop

Conflicts:
	app/views/layouts/_logined_header.html.erb

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- gem "test-unit", "~>3.0"
+ # gem "test-unit", "~>3.0"
 
 ### profile
- gem 'oneapm_rpm'
+ # gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/controllers/users_controller.rb

@@ -3200,6 +3200,7 @@ class UsersController < ApplicationController
         ori = Attachment.find_by_id(send_id)
         # 如果该附件已经存课程中，则只更新附件创建时间
         mul_container.attachments.each do |att|
+          @exist = false
           if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
             att.created_on = Time.now
             att.save

app/views/admin/homework.html.erb

@@ -38,11 +38,13 @@
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
               <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
-            <% if homework.course %>
-            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
-              <%= link_to(homework.course.name, course_path(homework.course.id)) %>
+
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%= homework.course.nil? ? "" : homework.course.name %>'>
+              <% if homework.course %>
+                <%= link_to homework.course.name, course_path(homework.course.id) %>
+              <% end %>
             </td>
-            <% end %>
+
             <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
               <% if homework.try(:user).try(:realname) == ' '%>
                   <%= link_to(homework.try(:user), user_path(homework.user_id)) %>

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/_logined_header.html.erb

@@ -17,10 +17,10 @@
           <!--<li class="navHomepageMenu fl mr30">-->
             <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
           <!--</li>-->
+      <% end %>
           <li class="navHomepageMenu fl mr40">
             <a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
           </li>
-      <% end %>
     </ul>
   </div>
   <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/layouts/base_users_new.html.erb

@@ -146,13 +146,13 @@
         </div>
       <% if @center_flag %>
             <div class="subNav">
-            <a href="<%=url_for(:controller => 'users', :action => 'user_courses',:id=>@user.id)%>" class=" f14 c_blue02">
+            <a href="<%=url_for(:controller => 'users', :action => 'user_courselist',:id=>@user.id)%>" class=" f14 c_blue02">
               我的课程
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.courses.count%>)</span>
             </a>
           </div>
             <div class="subNav">
-            <a href="<%=url_for(:controller => 'users', :action => 'user_projects',:id=>@user.id)%>" class=" f14 c_blue02">
+            <a href="<%=url_for(:controller => 'users', :action => 'user_projectlist',:id=>@user.id)%>" class=" f14 c_blue02">
               我的项目
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.count%>)</span>
             </a>

app/views/poll/other_poll.js.erb

@@ -1,6 +1,6 @@
 
 <% if @polls.empty? %>
-    alert('您目前还没有自己新建的问卷');
+    alert('您目前其他课程无问卷可导入');
 <% else %>
     $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>');
 

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;