diff --git a/app/models/event.rb b/app/models/event.rb index 12e2993..2364c5a 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -3,13 +3,14 @@ require 'builder' class Event < Article - attr_accessible :start_date, :end_date, :link, :address + attr_accessible :start_date, :end_date, :link, :address, :start_hour, :start_minute, :presenter def self.type_name _('Event') end settings_items :address, :type => :string + settings_items :presenter, :type => :string def link=(value) self.setting[:link] = maybe_add_http(value) diff --git a/app/views/cms/_event.html.erb b/app/views/cms/_event.html.erb index e32d52a..ce7c160 100644 --- a/app/views/cms/_event.html.erb +++ b/app/views/cms/_event.html.erb @@ -10,8 +10,14 @@ <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %> +<%= labelled_form_field(_('Start time'), time_select(:article, :start_date)) %> + <%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %> +<%= labelled_form_field(_('End time'), time_select(:article, :end_date)) %> + +<%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %> + <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %> <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %> -- libgit2 0.21.2