diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index b97fa1a64..69864f226 100644 --- a/app/services/courses_service.rb +++ b/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] diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb index eb46a41e6..12944e1f5 100644 --- a/app/views/projects/member.html.erb +++ b/app/views/projects/member.html.erb @@ -12,6 +12,6 @@ diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 0d4a55ff9..ce12b6b76 100644 --- a/app/views/projects/settings.html.erb +++ b/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"}); }); diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index 180cd22b0..a8a948a11 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -26,5 +26,5 @@ <% html_title(l(:label_followers)) -%> \ No newline at end of file diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 54c7434b0..08e723e6d 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -10,7 +10,7 @@ diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index 8471b503c..b7e744288 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -25,5 +25,5 @@ <% html_title(l(:label_change_plural)) -%> diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb index 69dae2629..273721bee 100644 --- a/app/views/repositories/quality_analyses.html.erb +++ b/app/views/repositories/quality_analyses.html.erb @@ -1,76 +1,80 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -
<%= link_to l(:button_back), :action => 'show', :id => @project %>
-<% html_title(l(:label_repository), l(:label_statistics)) -%> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +<%= link_to l(:button_back), :action => 'show', :id => @project %>
+<% html_title(l(:label_repository), l(:label_statistics)) -%> + + \ No newline at end of file diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb index 4b35e64f6..f14022810 100644 --- a/app/views/repositories/stats.html.erb +++ b/app/views/repositories/stats.html.erb @@ -1,195 +1,199 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -<%= link_to l(:button_back), :action => 'show', :id => @project %>
- <% html_title(l(:label_repository), l(:label_statistics)) -%> -<% end %> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +<%= link_to l(:button_back), :action => 'show', :id => @project %>
+ <% html_title(l(:label_repository), l(:label_statistics)) -%> +<% end %> + + \ No newline at end of file diff --git a/app/views/syllabuses/_syllabus_member_list.html.erb b/app/views/syllabuses/_syllabus_member_list.html.erb index 84bbe1d01..97a500f56 100644 --- a/app/views/syllabuses/_syllabus_member_list.html.erb +++ b/app/views/syllabuses/_syllabus_member_list.html.erb @@ -42,7 +42,9 @@ <% else %> 删除 <% end %> - <% if i != 0 && i < count - 1 %> + <% if i == 0 && count == 1 %> + + <% 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 %> diff --git a/app/views/syllabuses/members.html.erb b/app/views/syllabuses/members.html.erb index 456845400..2eb560116 100644 --- a/app/views/syllabuses/members.html.erb +++ b/app/views/syllabuses/members.html.erb @@ -13,11 +13,11 @@