diff --git a/app/views/application/_questionnaire_summary.html.haml b/app/views/application/_questionnaire_summary.html.haml index 4190687d4..818bd7fe0 100644 --- a/app/views/application/_questionnaire_summary.html.haml +++ b/app/views/application/_questionnaire_summary.html.haml @@ -21,9 +21,10 @@ %p %b Shirt size: = @questionnaire.shirt_size -%p - %b Dietary restrictions - = @questionnaire.dietary_restrictions || "(none)".html_safe +- if !HackathonConfig['digital_hackathon'] + %p + %b Dietary restrictions + = @questionnaire.dietary_restrictions || "(none)".html_safe %p %b Special needs = @questionnaire.special_needs || "(none)".html_safe diff --git a/app/views/manage/questionnaires/_overview.html.haml b/app/views/manage/questionnaires/_overview.html.haml index 9c54f3d43..e409b4601 100644 --- a/app/views/manage/questionnaires/_overview.html.haml +++ b/app/views/manage/questionnaires/_overview.html.haml @@ -33,13 +33,14 @@ .row %dt.col-md-4 Shirt size %dd.col-md-8= @questionnaire.shirt_size - %dt.col-md-4 Dietary restrictions - %dd.col-md-8 - - if @questionnaire.dietary_restrictions.present? - %span.fa.fa-exclamation-triangle.text-warning.icon-space-r-half - = @questionnaire.dietary_restrictions - - else - %span.text-muted (none) + - if !HackathonConfig['digital_hackathon'] + %dt.col-md-4 Dietary restrictions + %dd.col-md-8 + - if @questionnaire.dietary_restrictions.present? + %span.fa.fa-exclamation-triangle.text-warning.icon-space-r-half + = @questionnaire.dietary_restrictions + - else + %span.text-muted (none) %dt.col-md-4 Special needs %dd.col-md-8 - if @questionnaire.special_needs.present? diff --git a/app/views/questionnaires/_form.html.haml b/app/views/questionnaires/_form.html.haml index 9f6e5315d..37902c563 100644 --- a/app/views/questionnaires/_form.html.haml +++ b/app/views/questionnaires/_form.html.haml @@ -44,7 +44,7 @@ = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" } - if !HackathonConfig['digital_hackathon'] - = f.input :dietary_restrictions, as: :text, label: "Health restrictions", wrapper_html: { class: 'input--half' }, maxlength: Questionnaire::DIETARY_SPECIAL_NEEDS_MAX_LENGTH + = f.input :dietary_restrictions, as: :text, label: "Dietary restrictions", wrapper_html: { class: 'input--half' }, maxlength: Questionnaire::DIETARY_SPECIAL_NEEDS_MAX_LENGTH = f.input :special_needs, as: :text, label: "Special needs", wrapper_html: { class: 'input--half' }, maxlength: Questionnaire::DIETARY_SPECIAL_NEEDS_MAX_LENGTH - if @agreements.any?