From cb1fce32fe85148cea57401505699c34ea9b51e5 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 26 Mar 2015 17:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 2 + app/views/avatar/_new_avatar_form.html.erb | 26 +++++++++ app/views/courses/settings.html.erb | 63 ++++++++++++++++++++-- public/javascripts/course.js | 8 +++ 4 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 app/views/avatar/_new_avatar_form.html.erb diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 1ec8a0ef0..2010c8252 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -239,6 +239,8 @@ class CoursesService course.time = params[:time] course.term = params[:term] course.class_period = params[:class_period] + params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0 + params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0 if course.save if params[:course][:is_public] == '0' course_status = CourseStatus.find_by_course_id(course.id) diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb new file mode 100644 index 000000000..415ec09af --- /dev/null +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -0,0 +1,26 @@ + + <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%> + +<%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> +<%= file_field_tag 'avatar[image]', + :id => nil, + :class => 'upbtn fl', + :size => "1", + :multiple => false, + :onchange => 'addInputAvatar(this);', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :file_type => Redmine::Configuration['pic_types'].to_s, + :type_support_message => l(:error_pic_type), + :upload_path => upload_avatar_path(:format => 'js'), + :description_placeholder => nil ,# l(:label_optional_description) + :source_type => source.class.to_s, + :source_id => source.id.to_s + } %> + +<% content_for :header_tags do %> + <%= javascript_include_tag 'avatars' %> +<% end %> +
\ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index c2030ffec..74c82cf09 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -1,3 +1,60 @@ -

<%=l(:label_settings)%>

-<%= render_tabs course_settings_tabs %> -<% html_title(l(:label_settings)) -%> +
+

<%= l(:label_course_modify_settings)%>

+
+
+ +
+
\ No newline at end of file diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 65f45ea62..5e1e138bb 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -90,6 +90,14 @@ function submit_new_course() } } +function submit_edit_course(id) +{ + if(regex_course_name()&®ex_course_class_period()) + { + $("#edit_course_"+id).submit(); + } +} + /////////////////////////////////////////////////////////////// //验证搜索时输入名字