From fc737ec6a8563f787457a578087eb724a509dcb4 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 13 Nov 2019 11:36:06 +0800 Subject: [PATCH] fix some error --- app/views/admin/seminars/seminar_signup.html.erb | 13 +++++++++---- app/views/seminars/con_upload.html.erb | 2 +- app/views/seminars/edit_file.html.erb | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/admin/seminars/seminar_signup.html.erb b/app/views/admin/seminars/seminar_signup.html.erb index 4a3b18b..34e343b 100644 --- a/app/views/admin/seminars/seminar_signup.html.erb +++ b/app/views/admin/seminars/seminar_signup.html.erb @@ -19,6 +19,7 @@ <%= t('seminar_signup.name')%> <%= t('seminar.registration_status')%> + <%= t('seminar_signup.file_note')%> <%= t('seminar_signup.uploads')%> @@ -36,14 +37,18 @@ - <%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> + <%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> + + +
  • <%= seminar_signup_contribute.description.to_s.html_safe %>
  • + + <% end %> diff --git a/app/views/seminars/con_upload.html.erb b/app/views/seminars/con_upload.html.erb index 175cf42..16c81c7 100644 --- a/app/views/seminars/con_upload.html.erb +++ b/app/views/seminars/con_upload.html.erb @@ -31,7 +31,7 @@ %> <%= seminar_signup_contribute.title %> - <%= seminar_signup_contribute.description %> + <%= 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 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/app/views/seminars/edit_file.html.erb b/app/views/seminars/edit_file.html.erb index 503384f..0c3870e 100644 --- a/app/views/seminars/edit_file.html.erb +++ b/app/views/seminars/edit_file.html.erb @@ -1,4 +1,5 @@ <% # encoding: utf-8 %> +<%= stylesheet_link_tag "lib/jquery-ui-1.12.1/jquery-ui.min.css" %> <%= javascript_include_tag 'basic.js' %> <% data = action_data