diff --git a/config/locales/en.yml b/config/locales/en.yml index 7e7139b2aae9..fd505bdae63c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -997,6 +997,8 @@ en: name: blank: "is mandatory. Please select a name." not_unique: "is already in use. Please select another name." + meeting: + error_conflict: "Unable to save because the meeting was updated by someone else in the meantime. Please reload the page." notifications: at_least_one_channel: "At least one channel for sending notifications needs to be specified." attributes: diff --git a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb index 6d50c1888d09..0454078438f3 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb @@ -8,12 +8,12 @@ ) do |f| component_collection do |collection| collection.with_component(Primer::Alpha::Dialog::Body.new) do - flex_layout(my: 3) do |modal_body| + flex_layout(mb: 3) do |modal_body| modal_body.with_row do render(BaseErrorsComponent.new(@meeting)) end - modal_body.with_row do + modal_body.with_row(mt: 3) do render(Meeting::StartDate.new(f, initial_value: start_date_initial_value)) end