diff --git a/app/controllers/seminars_controller.rb b/app/controllers/seminars_controller.rb index 7a96d7a..785a9b7 100644 --- a/app/controllers/seminars_controller.rb +++ b/app/controllers/seminars_controller.rb @@ -4,6 +4,7 @@ class SeminarsController < ApplicationController include MemberHelper include ActionView::Context #vary important (only add this can access @@session from view) include Admin::SeminarsHelper + FrontendMethods = ["show_privacy", "show_data", "check_email", "check_availability", "signup_ok", "edit_file", "con_login", "con_upload", "con_logout"] # include SimpleCaptcha::ControllerHelpers def index diff --git a/app/helpers/admin/seminars_field_helper.rb b/app/helpers/admin/seminars_field_helper.rb index 5d100d9..8c63807 100644 --- a/app/helpers/admin/seminars_field_helper.rb +++ b/app/helpers/admin/seminars_field_helper.rb @@ -446,9 +446,11 @@ protected def form_label if self.markup == "text_area" plc = typeD["placeholder"][I18n.locale].to_s.blank? ? '' : "(#{typeD["placeholder"][I18n.locale]})" - ""+ - label_tag(key,(!@require.blank? ? '*'+title : title),:class=>"col-sm-2 control-label muted",:style =>'display: contents;')+ - tag(:br)+"#{plc}" + label_tag(key, '' , :class=>"col-sm-2 control-label muted") do + concat (!@require.blank? ? '*'+title : title) + concat tag(:br) + concat plc + end else label_tag(key,(!@require.blank? ? '*'+title : title),:class=>"col-sm-2 control-label muted") end