diff --git a/app/assets/stylesheets/seminar.css b/app/assets/stylesheets/seminar.css.scss similarity index 100% rename from app/assets/stylesheets/seminar.css rename to app/assets/stylesheets/seminar.css.scss diff --git a/app/assets/stylesheets/seminar/background_style/1/css/background.css b/app/assets/stylesheets/seminar/background_style/1/css/background.css index 57481ba..79d9e36 100644 --- a/app/assets/stylesheets/seminar/background_style/1/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/1/css/background.css @@ -60,4 +60,28 @@ header{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/10/css/background.css b/app/assets/stylesheets/seminar/background_style/10/css/background.css index 4370e21..5f0806e 100644 --- a/app/assets/stylesheets/seminar/background_style/10/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/10/css/background.css @@ -72,4 +72,26 @@ header{ .header-nav{ text-align: right; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/11/css/background.css b/app/assets/stylesheets/seminar/background_style/11/css/background.css index 782a581..5f5c25a 100644 --- a/app/assets/stylesheets/seminar/background_style/11/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/11/css/background.css @@ -64,4 +64,26 @@ body{ .layout-footer{ padding: 1em; } -} \ No newline at end of file +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } +} diff --git a/app/assets/stylesheets/seminar/background_style/12/css/background.css b/app/assets/stylesheets/seminar/background_style/12/css/background.css index d85b17c..9b2ec1a 100644 --- a/app/assets/stylesheets/seminar/background_style/12/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/12/css/background.css @@ -71,4 +71,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/13/css/background.css b/app/assets/stylesheets/seminar/background_style/13/css/background.css index 2f08483..5ce2102 100644 --- a/app/assets/stylesheets/seminar/background_style/13/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/13/css/background.css @@ -71,4 +71,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/14/css/background.css b/app/assets/stylesheets/seminar/background_style/14/css/background.css index 2fc3ce7..ae44d3e 100644 --- a/app/assets/stylesheets/seminar/background_style/14/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/14/css/background.css @@ -78,4 +78,26 @@ body{ .layout-footer{ padding: 1em; } -} \ No newline at end of file +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } +} diff --git a/app/assets/stylesheets/seminar/background_style/15/css/background.css b/app/assets/stylesheets/seminar/background_style/15/css/background.css index 2479730..fffa9a1 100644 --- a/app/assets/stylesheets/seminar/background_style/15/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/15/css/background.css @@ -75,4 +75,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/16/css/background.css b/app/assets/stylesheets/seminar/background_style/16/css/background.css index c016470..87e2705 100644 --- a/app/assets/stylesheets/seminar/background_style/16/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/16/css/background.css @@ -75,4 +75,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/17/css/background.css b/app/assets/stylesheets/seminar/background_style/17/css/background.css index d273ca2..83d4a00 100644 --- a/app/assets/stylesheets/seminar/background_style/17/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/17/css/background.css @@ -74,4 +74,27 @@ header{ .header-nav{ text-align: right; } +} + +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/2/css/background.css b/app/assets/stylesheets/seminar/background_style/2/css/background.css index 2f66629..15abb60 100644 --- a/app/assets/stylesheets/seminar/background_style/2/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/2/css/background.css @@ -64,4 +64,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/3/css/background.css b/app/assets/stylesheets/seminar/background_style/3/css/background.css index 923a98f..065239f 100644 --- a/app/assets/stylesheets/seminar/background_style/3/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/3/css/background.css @@ -75,4 +75,26 @@ header{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/4/css/background.css b/app/assets/stylesheets/seminar/background_style/4/css/background.css index 72720ab..4b6df1c 100644 --- a/app/assets/stylesheets/seminar/background_style/4/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/4/css/background.css @@ -63,4 +63,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/5/css/background.css b/app/assets/stylesheets/seminar/background_style/5/css/background.css index 63b5898..5f04cdf 100644 --- a/app/assets/stylesheets/seminar/background_style/5/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/5/css/background.css @@ -69,4 +69,26 @@ header{ .layout-header .header-nav{ text-align: right; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/6/css/background.css b/app/assets/stylesheets/seminar/background_style/6/css/background.css index 7c66551..59d3d3f 100644 --- a/app/assets/stylesheets/seminar/background_style/6/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/6/css/background.css @@ -72,4 +72,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/7/css/background.css b/app/assets/stylesheets/seminar/background_style/7/css/background.css index c98ab9f..12cec21 100644 --- a/app/assets/stylesheets/seminar/background_style/7/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/7/css/background.css @@ -77,4 +77,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/8/css/background.css b/app/assets/stylesheets/seminar/background_style/8/css/background.css index 1e85015..0bf0c89 100644 --- a/app/assets/stylesheets/seminar/background_style/8/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/8/css/background.css @@ -7,7 +7,7 @@ .layout-footer .layout-footer-inner{ background: #ffffff; } -.layout-header{ +.layout-header > .container{ background: #01538f; } body{ @@ -79,4 +79,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/background_style/9/css/background.css b/app/assets/stylesheets/seminar/background_style/9/css/background.css index 453b2f5..8e04fe0 100644 --- a/app/assets/stylesheets/seminar/background_style/9/css/background.css +++ b/app/assets/stylesheets/seminar/background_style/9/css/background.css @@ -77,4 +77,26 @@ body{ .layout-footer{ padding: 1em; } +} +@media (min-width: 1200px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 80%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 80%; + } +} +@media (min-width: 768px)and(max-width: 1199px){ + .internal-page.seminar_custom_page header{ + width: 100%; + } + .internal-page.seminar_custom_page header .container { + width: 90%; + } + .internal-page.seminar_custom_page .mainContent,.internal-page.seminar_custom_page .layout-slide,.internal-page.seminar_custom_page .layout-content-inner.container,.internal-page.seminar_custom_page .container.layout-footer-inner { + width: 90%; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/seminar/content_style/12/css/template.css b/app/assets/stylesheets/seminar/content_style/12/css/template.css index 487640e..ee4873f 100644 --- a/app/assets/stylesheets/seminar/content_style/12/css/template.css +++ b/app/assets/stylesheets/seminar/content_style/12/css/template.css @@ -108,4 +108,7 @@ li.w-annc__item.row .w-annc__postdate-wrap { [data-module="seminars_home"] .row > * > section:nth-of-type(1){ padding-right: 1em; } +} +.page-content-box[data-pp="200"],.page-content-box[data-pp="201"]{ + background:#fff; } \ No newline at end of file diff --git a/app/views/admin/seminars/_form.html.erb b/app/views/admin/seminars/_form.html.erb index dcf6be6..99172a4 100644 --- a/app/views/admin/seminars/_form.html.erb +++ b/app/views/admin/seminars/_form.html.erb @@ -273,9 +273,13 @@ <% @custom_set.each_with_index do |attr_custom,custom_index| %> + <% + seminar_signup_field = SeminarSignupField.where(id:attr_custom.seminar_signup_field_id).first + next if seminar_signup_field.nil? + %> - <%= SeminarSignupField.where(id:attr_custom.seminar_signup_field_id).first.title rescue '' %> + <%= seminar_signup_field.title rescue '' %> diff --git a/app/views/admin/seminars/_get_display_fields.html.erb b/app/views/admin/seminars/_get_display_fields.html.erb index c1e9005..88f212e 100644 --- a/app/views/admin/seminars/_get_display_fields.html.erb +++ b/app/views/admin/seminars/_get_display_fields.html.erb @@ -22,7 +22,7 @@ <% @field_name_translations << t(th) %> <% end %> <% end %> - <% if @seminar.seminar_signup_field_customs.count != 0 %> + <% if false #@seminar.seminar_signup_field_customs.count != 0 %> <% @seminar.seminar_signup_field_customs.each do |field_set| %> <% s = SeminarSignupField.where(id:field_set.seminar_signup_field_id).first %> <% title = s.title rescue '' %> @@ -104,7 +104,7 @@ <% end %> <% end %> <% seminar_signup_field_customs = SeminarSignupFieldCustom.all.map{|field_set| SeminarSignupField.where(id: field_set.seminar_signup_field_id).first}.select{|s| !s.nil?}.uniq{|s| s.key } %> - <% if seminar_signup_field_customs.count != 0 %> + <% if false #seminar_signup_field_customs.count != 0 %> <% seminar_signup_field_customs.each do |s| %> <% title = s.title rescue '' %> <% next if title.blank? %> diff --git a/app/views/admin/seminars/_seminar_signup_render_table.html.erb b/app/views/admin/seminars/_seminar_signup_render_table.html.erb index 03fd3c9..9cbe1c3 100644 --- a/app/views/admin/seminars/_seminar_signup_render_table.html.erb +++ b/app/views/admin/seminars/_seminar_signup_render_table.html.erb @@ -8,9 +8,11 @@ <% if @drag%> <% end %> - <% @field_name_translations.each_with_index do |trans,i|%> - <% next unless @display_field.include?(@field_names[i]) %> - <%= trans %> + <% + @field_name_translations = @field_name_translations.map.with_index{|trans,i| [@field_names[i], trans]}.to_h + %> + <% @display_field.each do |field_name| %> + <%= @field_name_translations[field_name] %> <% end %>