From fc737ec6a8563f787457a578087eb724a509dcb4 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
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 @@
     <tr class="sort-header">
      <th class='span2'><%= t('seminar_signup.name')%></th>
      <th class='span2'><%= t('seminar.registration_status')%></th>
+     <th class='span2'><%= t('seminar_signup.file_note')%></th>
      <th class='span2'><%= t('seminar_signup.uploads')%></th>
     </tr>
   </thead>
@@ -36,14 +37,18 @@
             </ul>
           </div>
         </td>
-        <td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %></td>
+        <td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %>
+        </td>
+        <td>
+          <li><%= seminar_signup_contribute.description.to_s.html_safe %></li>
+          </ul>
+        </td>
         <td>
           <ul>
           <% seminar_signup.seminar_signup_contributes.collect do |seminar_signup_contribute| %>
-          <li><%= 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           
-          %></li>
+            <li><%= 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'} if seminar_signup_contribute.file.file %>         
+            </li>
           <% end %>
-          </ul>
         </td>
       </tr>
     <% 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 @@
 			%>
 			<tr>
 				<td><%= seminar_signup_contribute.title %></td>
-				<td><%= seminar_signup_contribute.description %></td>
+				<td><%= seminar_signup_contribute.description.to_s.html_safe %></td>
 				<td><%= 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 %></td>
 				<td>
 					<%= 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