diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index 208002ed..af74db93 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -174,8 +174,8 @@ sidebar#lug-list margin-left: 6.75em margin-bottom: 10px - .mce-tinymce * - @include transition-duration(0) + .mce-tinymce + display: inline-block .description text-align: left diff --git a/app/views/events/_form.html.haml b/app/views/events/_form.html.haml index e01cc315..5821ddf3 100644 --- a/app/views/events/_form.html.haml +++ b/app/views/events/_form.html.haml @@ -23,44 +23,44 @@ = f.label :title = f.text_field :title, required: true ,size: 70 .field - = f.label Event.human_attribute_name :start_time - = f.datetime_select :start_time, required: true + = f.label :start_time + %span#event_start_time= f.datetime_select :start_time, required: true .field - = f.label Event.human_attribute_name :end_time - = f.datetime_select :end_time, required: true + = f.label :end_time + %span#event_end_time= f.datetime_select :end_time, required: true .field .helper :markdown #{t '.description_helper'} - = f.label Event.human_attribute_name :description + = f.label :description = f.text_area :description, required: true, class: 'tinymce', rows: 29, cols: 80 = tinymce language: 'fr_FR' .field - = f.label Event.human_attribute_name :city + = f.label :city = f.text_field :city, required: true, size: 70, list: :cities %datalist#cities - City.connection.select_values('select distinct name from cities join events on name=city group by city order by count(*) desc').each do |name| %option= name .field - = f.label Event.human_attribute_name :related_region + = f.label :region = f.select :region, options_from_collection_for_select(Region.all, 'id', 'name', @event.region) .field - = f.label Event.human_attribute_name :locality + = f.label :locality = f.select :locality, options_for_select([[t('attributes.locality_0'), 0], [t('attributes.locality_1'), 1]], @event.locality) .field .helper :markdown #{t '.url_helper'} - = f.label Event.human_attribute_name :url + = f.label :url = f.text_field :url, required: true, size: 70, placeholder: 'Ex: http://april.org' .field .helper :markdown #{t '.contact_helper'} - = f.label Event.human_attribute_name :contact + = f.label :contact = f.text_field :contact, required: true, size: 70 .field .helper