From 5b4136b2907ffc918210495d8f9a29c1e7d681fb Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Wed, 28 Oct 2015 11:35:08 +0100 Subject: Merge Timeband feature and revert Gemfile --- app/views/help/timebands.textile | 0 app/views/shared/_header.erb | 4 ++++ app/views/timebands/_form.html.erb | 12 ++++++++++++ app/views/timebands/_sidebar.html.erb | 11 +++++++++++ app/views/timebands/edit.html.erb | 3 +++ app/views/timebands/index.html.erb | 29 +++++++++++++++++++++++++++++ app/views/timebands/new.html.erb | 3 +++ app/views/timebands/show.html.erb | 12 ++++++++++++ 8 files changed, 74 insertions(+) create mode 100644 app/views/help/timebands.textile create mode 100644 app/views/timebands/_form.html.erb create mode 100644 app/views/timebands/_sidebar.html.erb create mode 100644 app/views/timebands/edit.html.erb create mode 100644 app/views/timebands/index.html.erb create mode 100644 app/views/timebands/new.html.erb create mode 100644 app/views/timebands/show.html.erb (limited to 'app/views') diff --git a/app/views/help/timebands.textile b/app/views/help/timebands.textile new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb index d1e8dd2ce..1e8a63fba 100644 --- a/app/views/shared/_header.erb +++ b/app/views/shared/_header.erb @@ -65,6 +65,10 @@ <%= @referential.time_tables.size %><%= Referential.human_attribute_name("time_tables") %> <% end %> +
| <%= t('activerecord.attributes.timeband.name') %> | +<%= t('activerecord.attributes.timeband.start_time') %> | +<%= t('activerecord.attributes.timeband.end_time') %> | ++ | 
|---|---|---|---|
| <%= link_to timeband.name, referential_timeband_path(@referential, timeband) %> | +<%= l(timeband.start_time, format: :hour) %> | +<%= l(timeband.end_time, format: :hour) %> | ++ <%= link_to '', edit_referential_timeband_path(@referential, timeband), :class => "edit" %> + <%= link_to '', referential_timeband_path(@referential, timeband), :method => :delete, :data => {:confirm => t('timebands.actions.destroy_confirm')}, :class => "remove" %> + | +
+ + <%= l(@timeband.start_time, format: :hour) %> + - + <%= l(@timeband.end_time, format: :hour) %> +
+