Merge branch 'develop' into dev_newrep

app/services/courses_service.rb

@@ -418,7 +418,7 @@ class CoursesService
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
     #course.password = params[:course][:password]
-    course.syllabus_id = params[:syllabus_id].to_i
+    #course.syllabus_id = params[:syllabus_id].to_i
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]

app/views/projects/member.html.erb

@@ -12,6 +12,6 @@
 </div>
 
 <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/projects/settings.html.erb

@@ -16,7 +16,7 @@
           <% end%>
         <% end%>
         $("div[nhname='pro_setting']").show();
-        $("#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/projects/watcherlist.html.erb

@@ -26,5 +26,5 @@
 <% html_title(l(:label_followers)) -%>
 
 <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/_new.html.erb

@@ -10,7 +10,7 @@
 </div>
 
 <script>
-    $("#pull_request_new_form").parent().css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 
     $("#changed-files").toggle(function(){
         $("#changed-files-detail").show();

app/views/pull_requests/_show.html.erb

@@ -67,7 +67,7 @@
 
 
 <script>
-    $("#pull_request_show").parent().css("width","730px");
+    $("#pull_request_show").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 
     $(".merge-record li a").click(function(){
         $(".merge-record li a").removeClass("active");

app/views/quality_analysis/_show.html.erb

@@ -162,6 +162,6 @@
 <% 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/changes.html.erb

@@ -25,5 +25,5 @@
 <% html_title(l(:label_change_plural)) -%>
 
 <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/quality_analyses.html.erb

@@ -74,3 +74,7 @@
 
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
 <% html_title(l(:label_repository), l(:label_statistics)) -%>
+
+<script>
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
+</script>

app/views/repositories/stats.html.erb

@@ -193,3 +193,7 @@
     <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
     <% html_title(l(:label_repository), l(:label_statistics)) -%>
 <% end %>
+
+<script>
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
+</script>

app/views/syllabuses/_syllabus_member_list.html.erb

@@ -42,7 +42,9 @@
               <% else %>
                   <a href="javascript:void(0)" class="fr sy_btn_grey mr5" title="该老师已在本课程下创建了班级，不能删除">删除</a>
               <% end %>
-            <% if i != 0 && i < count - 1 %>
+            <% if i == 0 && count == 1 %>
+                &nbsp;
+            <% elsif i != 0 && i < count - 1 %>
                 <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %>
                 <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %>
             <% elsif i < count - 1 %>

app/views/syllabuses/members.html.erb

@@ -13,11 +13,11 @@
 <div id="sy_tab_con_3">
   <div class="sy_new_tablebox clear">
     <%= render :partial => 'syllabus_member_list' %>
-    <% if User.current == @syllabus.user %>
+    <% if User.current == @syllabus.user || User.current.admin? %>
         <a href="javascript:void(0);" class="fl sy_btn_green" onclick="toggle_search();">添加成员</a>
     <% end %>
   </div>
-  <% if User.current == @syllabus.user %>
+  <% if User.current == @syllabus.user || User.current.admin? %>
   <div class="sy_new_tchbox clear <%= @show == 1 ? '' : 'undis' %>" id="sy_search_box">
     <%= form_tag url_for(:controller => 'syllabus_member', :action => 'create', :syllabus => @syllabus),:id => 'syllabus_member_add_form', :remote => true do |f|%>
         <input hidden="hidden" value="true" name="flag">

app/views/syllabuses/show.html.erb

@@ -5,6 +5,14 @@
     $(function() {
         sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>");
         showNormalImage('syllabus_description_<%= @syllabus.id %>');
+        $("#syllabus_description_<%= @syllabus.id%> p,#syllabus_description_<%= @syllabus.id%> span,#syllabus_description_<%= @syllabus.id%> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
         autoUrl('syllabus_description_<%= @syllabus.id %>');
     });
 </script>