456
/
seminar2_old
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix errors

This commit is contained in:
chiu 2019-11-13 12:07:16 +08:00
parent 8efa1fc2c5
commit ccea066ecc
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/admin/seminars/seminar_signup.html.erb
View File

@ -40,15 +40,17 @@
<td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> <td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %>
</td> </td>
<ul> <ul>
<td>
<% seminar_signup.seminar_signup_contributes.collect do |seminar_signup_contribute| %> <% seminar_signup.seminar_signup_contributes.collect do |seminar_signup_contribute| %>
<td>
<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>
</td>
<td>
<li><%= seminar_signup_contribute.description.to_s.html_safe %></li> <li><%= seminar_signup_contribute.description.to_s.html_safe %></li>
</td>
<% end %> <% end %>
</td>
<td>
<% 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 => Nokogiri::HTML(seminar_signup_contribute.description).text} if seminar_signup_contribute.file.file %>
</li>
<% end %>
</td>
</ul> </ul>
</tr> </tr>
<% end %> <% end %>

4
app/views/seminars/add_file.html.erb
View File

@ -1,4 +1,6 @@
<% # encoding: utf-8 %> <% # encoding: utf-8 %>
<%= stylesheet_link_tag "lib/jquery-ui-1.12.1/jquery-ui.min.css" %>
<%= javascript_include_tag 'basic.js' %>
<% @@session = session %> <% @@session = session %>
<%= yield %> <%= yield %>
<% <%
@ -24,7 +26,7 @@
<div class="form-group"> <div class="form-group">
<label for="note" class="col-sm-2 control-label"><%= t('seminar_signup.file_note') %></label> <label for="note" class="col-sm-2 control-label"><%= t('seminar_signup.file_note') %></label>
<div class="col-sm-10"> <div class="col-sm-10">
<%= 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') %>
</div> </div>
</div> </div>

2
app/views/seminars/con_upload.html.erb
View File

@ -32,7 +32,7 @@
<tr> <tr>
<td><%= seminar_signup_contribute.title %></td> <td><%= seminar_signup_contribute.title %></td>
<td><%= seminar_signup_contribute.description.to_s.html_safe %></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 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 %></td>
<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' %> <%= link_to t(:edit), OrbitHelper.url_to_show(@seminar.to_param) + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary' %>
<form method="post" action="<%= del_file_seminars_path %>"> <form method="post" action="<%= del_file_seminars_path %>">

2
config/locales/en.yml
View File

@ -31,7 +31,7 @@ en:
act_place: Seminar Location #活動地點 act_place: Seminar Location #活動地點
registration_status: Attendee Role #報名身分 registration_status: Attendee Role #報名身分
registration_status_C: Contributor #投稿者 registration_status_C: Contributor #投稿者
registration_status_G: 一般報名 registration_status_G: Normal sign up #一般報名
seminar_start_date: Seminar Start Date #活動開始時間 seminar_start_date: Seminar Start Date #活動開始時間
seminar_end_date: Seminar End Date #活動結束時間 seminar_end_date: Seminar End Date #活動結束時間
signup_start_date: Sign Up Start Date #報名開始時間 signup_start_date: Sign Up Start Date #報名開始時間