diff --git a/app/views/admin/seminars/seminar_signup.html.erb b/app/views/admin/seminars/seminar_signup.html.erb index f38cc32..a1a0963 100644 --- a/app/views/admin/seminars/seminar_signup.html.erb +++ b/app/views/admin/seminars/seminar_signup.html.erb @@ -40,15 +40,17 @@ <%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> <% end %> diff --git a/app/views/seminars/add_file.html.erb b/app/views/seminars/add_file.html.erb index 87a7b6b..0fadf5f 100644 --- a/app/views/seminars/add_file.html.erb +++ b/app/views/seminars/add_file.html.erb @@ -1,4 +1,6 @@ <% # encoding: utf-8 %> +<%= stylesheet_link_tag "lib/jquery-ui-1.12.1/jquery-ui.min.css" %> +<%= javascript_include_tag 'basic.js' %> <% @@session = session %> <%= yield %> <% @@ -24,7 +26,7 @@
- <%= f.text_area :description, rows: 5, :class=>"input-medium form-control", :placeholder=> t('seminar_signup.file_note') %> + <%= f.text_area :description, rows: 5, :class=>"ckeditor input-medium form-control", :placeholder=> t('seminar_signup.file_note') %>
diff --git a/app/views/seminars/con_upload.html.erb b/app/views/seminars/con_upload.html.erb index 16c81c7..8c65512 100644 --- a/app/views/seminars/con_upload.html.erb +++ b/app/views/seminars/con_upload.html.erb @@ -32,7 +32,7 @@ <%= seminar_signup_contribute.title %> <%= seminar_signup_contribute.description.to_s.html_safe %> - <%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => seminar_signup_contribute.description} if seminar_signup_contribute.file.file %> + <%= link_to File.basename(seminar_signup_contribute.file.path), seminar_signup_contribute.file.url, {:target => '_blank', :title => Nokogiri::HTML(seminar_signup_contribute.description).text} if seminar_signup_contribute.file.file %> <%= link_to t(:edit), OrbitHelper.url_to_show(@seminar.to_param) + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 440010d..3a63fa3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -31,7 +31,7 @@ en: act_place: Seminar Location #活動地點 registration_status: Attendee Role #報名身分 registration_status_C: Contributor #投稿者 - registration_status_G: 一般報名 + registration_status_G: Normal sign up #一般報名 seminar_start_date: Seminar Start Date #活動開始時間 seminar_end_date: Seminar End Date #活動結束時間 signup_start_date: Sign Up Start Date #報名開始時間