diff --git a/app/views/admin/dmptemplates/settings.html.erb b/app/views/admin/dmptemplates/settings.html.erb index c955083..df9557e 100644 --- a/app/views/admin/dmptemplates/settings.html.erb +++ b/app/views/admin/dmptemplates/settings.html.erb @@ -13,10 +13,14 @@
  • <%= f.label(_('Margin')) %> - <% ["top", "bottom", "left", "right"].each do |pos| %> - <%= t("helpers.settings.plans.margins.#{pos}") -%> - <%= select_tag("settings[export][formatting][margin][#{pos}]", options_for_select((0..100).to_a, @settings.formatting[:margin][pos])) %> - <% end %> + <%= _('Top') -%> + <%= select_tag("settings[export][formatting][margin][top]", options_for_select((0..100).to_a, @settings.formatting[:margin][:top])) %> + <%= _('Bottom') -%> + <%= select_tag("settings[export][formatting][margin][bottom]", options_for_select((0..100).to_a, @settings.formatting[:margin][:bottom])) %> + <%= _('Left') -%> + <%= select_tag("settings[export][formatting][margin][left]", options_for_select((0..100).to_a, @settings.formatting[:margin][:left])) %> + <%= _('Right') -%> + <%= select_tag("settings[export][formatting][margin][right]", options_for_select((0..100).to_a, @settings.formatting[:margin][:right])) %>
  • diff --git a/app/views/phases/_answer.html.erb b/app/views/phases/_answer.html.erb index 7e74f5b..3383519 100644 --- a/app/views/phases/_answer.html.erb +++ b/app/views/phases/_answer.html.erb @@ -58,7 +58,7 @@ <% if question.option_comment_display %> - <%= label_tag("answer-text-Ans#{question.id}".to_sym, t("helpers.comment")) %> + <%= label_tag("answer-text-Ans#{question.id}".to_sym, _('Comment')) %> <%= text_area_tag("answer-text-Ans#{question.id}".to_sym, answer.text, class: "tinymce") %> <%end%> <% end %> diff --git a/app/views/settings/phases/_export_formatting_form.html.erb b/app/views/settings/phases/_export_formatting_form.html.erb index badda63..730a90f 100644 --- a/app/views/settings/phases/_export_formatting_form.html.erb +++ b/app/views/settings/phases/_export_formatting_form.html.erb @@ -85,13 +85,22 @@
    <%= _('Margin') -%> (mm) - - <% ["top", "bottom", "left", "right"].each do |pos| %>
    - <%= label_tag("export[formatting][margin][#{pos}]", t("helpers.settings.plans.margins.#{pos}")) %> - <%= select_tag("export[formatting][margin][#{pos}]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][pos]), { "data-default" => plan.template.settings(:export).formatting[:margin][pos] }) %> + <%= label_tag("export[formatting][margin][top]", _('Top')) %> + <%= select_tag("export[formatting][margin][top]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:top]), { "data-default" => plan.template.settings(:export).formatting[:margin][:top] }) %>
    - <% end %> +
    + <%= label_tag("export[formatting][margin][bottom]", _('Bottom')) %> + <%= select_tag("export[formatting][margin][bottom]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:bottom]), { "data-default" => plan.template.settings(:export).formatting[:margin][:bottom] }) %> +
    +
    + <%= label_tag("export[formatting][margin][left]", _('Left')) %> + <%= select_tag("export[formatting][margin][left]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:left]), { "data-default" => plan.template.settings(:export).formatting[:margin][:left] }) %> +
    +
    + <%= label_tag("export[formatting][margin][right]", _('Right')) %> + <%= select_tag("export[formatting][margin][right]", options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a, @export_settings.formatting[:margin][:right]), { "data-default" => plan.template.settings(:export).formatting[:margin][:rigth] }) %> +