<%
- attribute_field.af_count ? @af_counter = attribute_field_counter + attribute_field.af_count : @af_counter = attribute_field_counter
+ @af_counter = attribute_field_counter
%>
@@ -18,27 +18,27 @@
- <%= text_field "#{@field_name}[seminar_signup_fields][#{@af_counter}]","key",:value=>attribute_field.key, :data=>{:type=>"key"} %>
+ <%= text_field "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}]","key",:value=>attribute_field.key, :data=>{:type=>"key"} %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][title_translations]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][title_translations]"}%>
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][typeA][placeholder]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeA][placeholder]"}%>
<% end if show_seminar_type_panel(attribute_field,"typeA") != 'typeA hide' %>
<%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_field,"typeB")}" do %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][typeB][initial]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeB][initial]"}%>
<% if attribute_field.self_defined_markup_options?%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields][#{@af_counter}][attribute][seminar][statuses]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][attribute][seminar][statuses]"} %>
<%else #normal list%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields][#{@af_counter}][typeB][option_list]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeB][option_list]"} %>
<% end #of self_defined_markup_options?%>
<% end if show_seminar_type_panel(attribute_field,"typeB") != 'typeB hide' %>
@@ -84,17 +84,17 @@
- <%= select "#{@field_name}[seminar_signup_fields][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
+ <%= select "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
@@ -102,10 +102,10 @@
@@ -116,18 +116,18 @@
<%
- attribute_submission_field.af_count ? @af_counter = attribute_submission_field_counter + attribute_submission_field.af_count : @af_counter = attribute_submission_field_counter
+ @af_counter = attribute_submission_field_counter
%>
@@ -18,27 +18,27 @@
- <%= text_field "#{@field_name}[seminar_submission_fields][#{@af_counter}]","key",:value=>attribute_submission_field.key, :data=>{:type=>"key"} %>
+ <%= text_field "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}]","key",:value=>attribute_submission_field.key, :data=>{:type=>"key"} %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][title_translations]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][title_translations]"}%>
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][typeA][placeholder]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeA][placeholder]"}%>
<% end if show_seminar_type_panel(attribute_submission_field,"typeA") != 'typeA hide' %>
<%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeB")}" do %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_submission_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][typeB][initial]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_submission_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeB][initial]"}%>
<% if attribute_submission_field.self_defined_markup_options?%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields][#{@af_counter}][attribute][seminar][statuses]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][attribute][seminar][statuses]"} %>
<%else #normal list%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields][#{@af_counter}][typeB][option_list]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeB][option_list]"} %>
<% end #of self_defined_markup_options?%>
<% end if show_seminar_type_panel(attribute_submission_field,"typeB") != 'typeB hide' %>
@@ -84,17 +84,17 @@
- <%= select "#{@field_name}[seminar_submission_fields][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_submission_field["typeC"]["format"] %>
+ <%= select "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_submission_field["typeC"]["format"] %>
@@ -102,10 +102,10 @@
@@ -116,16 +116,16 @@
diff --git a/app/views/seminars/index.html.erb b/app/views/seminars/index.html.erb
index 9b70e05..e0108df 100644
--- a/app/views/seminars/index.html.erb
+++ b/app/views/seminars/index.html.erb
@@ -23,25 +23,26 @@
<%
@seminars.each do |seminar|
-
- if !seminar.registration_status.blank? and (seminar.signup_start_date <= @time_now rescue false) and ( seminar.signup_end_date.nil? or seminar.signup_end_date+1 >= @time_now )
- sign_up = ('' + t('seminar.signup') + '').html_safe
- elsif seminar.registration_status.blank?
- sign_up = t('seminar.sign_up_not_open')
- elsif (seminar.signup_start_date > @time_now rescue false)
- sign_up = t('seminar.sign_up_not_yet')
- else
- sign_up = t('seminar.sign_up_overdue')
- end
+ registration_is_open = seminar.registration_status.present?
+ sign_up_not_yet = seminar.signup_start_date && @time_now && seminar.signup_start_date > @time_now
+ sign_up_overdue = seminar.signup_end_date && @time_now && (seminar.signup_end_date + 1.day <= @time_now)
+ seminar_url = OrbitHelper.url_to_show(seminar.to_param)
+ if !registration_is_open
+ sign_up = t('seminar.sign_up_not_open')
+ elsif sign_up_not_yet
+ sign_up = t('seminar.sign_up_not_yet')
+ elsif sign_up_overdue
+ sign_up = t('seminar.sign_up_overdue')
+ else
+ sign_up_text = t('seminar.signup')
+ sign_up = link_to(sign_up_text, seminar.get_frontend_url(seminar_url), :target=>'_blank', :title=>sign_up_text)
+ end
+ seminar_title = seminar.title
%>
| <%= seminar.category.title %> |
- <% if (seminar.enable_custom_template rescue false) %>
- <%= ('' + seminar.title + '').html_safe %>
- <% else %>
- <%= ('' + seminar.title + '').html_safe %>
- <% end %>
+ <%= link_to(seminar_title, seminar.get_frontend_url(seminar_url, :show_data), :target=>'_blank', :title=>seminar_title) %>
|
<%= SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date) %> |
<%= seminar.act_place %> |
@@ -49,15 +50,13 @@
<%= sign_up %>
<%=
- if !seminar.registration_status.blank? and seminar.registration_status.include?('C') and (seminar.contribute_start_date <= @time_now rescue false) and ( seminar.contribute_end_date.nil? or (seminar.contribute_end_date+1 >= @time_now rescue false) )
- if !session[:seminar_signup_id].blank?
- if session[:seminar_main_id] == seminar.id
- ('' + t('seminar_signup.uploads') + '').html_safe
- else
- ('' + t('seminar_signup.con_login') + '').html_safe
- end
+ if registration_is_open && seminar.registration_status.include?('C') && (seminar.contribute_start_date.nil? || seminar.contribute_start_date <= @time_now rescue false) && ( seminar.contribute_end_date.nil? || (seminar.contribute_end_date+1.day >= @time_now rescue false) )
+ if session[:seminar_signup_id].present? && session[:seminar_main_id] == seminar.id
+ button_text = t('seminar_signup.uploads')
+ link_to(button_text, seminar.get_frontend_url(seminar_url, :con_upload), :title=>button_text)
else
- ('' + t('seminar_signup.con_login') + '').html_safe
+ button_text = t('seminar_signup.con_login')
+ link_to(button_text, seminar.get_frontend_url(seminar_url, :con_login), :title=>button_text)
end
end
%>
diff --git a/app/views/seminars/show.html.erb b/app/views/seminars/show.html.erb
index 4107704..2608529 100644
--- a/app/views/seminars/show.html.erb
+++ b/app/views/seminars/show.html.erb
@@ -9,9 +9,22 @@
else
prefix_url = OrbitHelper.url_to_show(@seminar.to_param)
end
+ registration_is_open = @seminar.registration_status.present?
+ sign_up_not_yet = @seminar.signup_start_date && @time_now && @seminar.signup_start_date > @time_now
+ sign_up_overdue = @seminar.signup_end_date && @time_now && (@seminar.signup_end_date + 1.day <= @time_now)
%>
-<% if !@seminar.registration_status.blank? and @seminar.signup_start_date < @time_now and ( @seminar.signup_end_date.nil? or @seminar.signup_end_date+1 > @time_now ) %>
-
+<% if !registration_is_open %>
+
+<%= t('seminar.sign_up_not_open') %>
+
+<% elsif sign_up_not_yet %>
+
+<%= t('seminar.sign_up_not_yet') %>
+
+<% elsif sign_up_overdue %>
+
+<%= t('seminar.sign_up_overdue') %>
+<% else %>
<%#= stylesheet_link_tag "lib/main-forms" %>
<%= stylesheet_link_tag "basic/bootstrap-datetimepicker" %>
<%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
@@ -322,16 +335,4 @@ alert("1ssss2");
})();
-<% elsif @seminar.registration_status.blank? %>
-
-<%= t('seminar.sign_up_not_open') %>
-
-<% elsif @seminar.signup_start_date > @time_now %>
-
-<%= t('seminar.sign_up_not_yet') %>
-
-<% else %>
-
-<%= t('seminar.sign_up_overdue') %>
-
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd200be..1a7e1f3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -85,6 +85,7 @@ en:
dashboard: Dashboard
display_field: Display field
note: Note
+ email_exist: "Email exist!"
email_signup_success: Signup success
email_submission_success: Submission registration success
email_add_file_success: Add file success
@@ -153,6 +154,7 @@ en:
sign_up_not_yet: Does Not Yet Allow Sign Up #報名時間未開始
sign_up_not_open: Does Not Open Sign Up #未開放報名
sign_up_overdue: Sign Up Overdue #報名時間已過
+ sign_up_failed: "Sign up failed!"
contribute_file_count: Count of Contribute Files #投稿檔案數
frontend:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index bbb5d8d..58e1a9e 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -86,6 +86,7 @@ zh_tw:
dashboard: 儀錶板
display_field: 顯示的欄位
note: 附註
+ email_exist: "email已存在!"
email_signup_success: 報名成功
email_submission_success: 投稿註冊成功
email_add_file_success: 新增上傳成功
@@ -154,6 +155,7 @@ zh_tw:
sign_up_not_yet: 報名時間未開始
sign_up_not_open: 未開放報名
sign_up_overdue: 報名時間已過
+ sign_up_failed: "報名失敗"
contribute_file_count: 投稿檔案數
frontend: