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 %> +
  • <%= link_to referential_timebands_path(@referential) do %> + <%= @referential.timebands.size %><%= Referential.human_attribute_name("timebands") %> + <% end %> +
  • <%= link_to Referential.human_attribute_name("imports"), referential_imports_path(@referential) %>
  • diff --git a/app/views/timebands/_form.html.erb b/app/views/timebands/_form.html.erb new file mode 100644 index 000000000..bfa32212e --- /dev/null +++ b/app/views/timebands/_form.html.erb @@ -0,0 +1,12 @@ +<%= semantic_form_for [@referential, @timeband] do |form| %> + <%= form.inputs do %> + <%= form.input :name %> + <%= form.input :start_time %> + <%= form.input :end_time %> + <% end %> + + <%= form.actions do %> + <%= form.action :submit, :as => :button %> + <%= form.action :cancel, :as => :link %> + <% end %> +<% end %> diff --git a/app/views/timebands/_sidebar.html.erb b/app/views/timebands/_sidebar.html.erb new file mode 100644 index 000000000..8ffa16dca --- /dev/null +++ b/app/views/timebands/_sidebar.html.erb @@ -0,0 +1,11 @@ +<% content_for :sidebar do %> + +<% end %> + + diff --git a/app/views/timebands/edit.html.erb b/app/views/timebands/edit.html.erb new file mode 100644 index 000000000..bc2c73ace --- /dev/null +++ b/app/views/timebands/edit.html.erb @@ -0,0 +1,3 @@ +<%= title_tag t('timebands.edit.title', timeband: @timeband.name) %> + +<%= render "form" %> diff --git a/app/views/timebands/index.html.erb b/app/views/timebands/index.html.erb new file mode 100644 index 000000000..54be52675 --- /dev/null +++ b/app/views/timebands/index.html.erb @@ -0,0 +1,29 @@ +<%= title_tag t('timebands.index.title') %> + +<% if @timebands.any? %> + + + + + + + + + + + <% @timebands.each do |timeband| %> + + + + + + + <% 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" %> +
    +<% end %> + +<%= render 'sidebar' %> diff --git a/app/views/timebands/new.html.erb b/app/views/timebands/new.html.erb new file mode 100644 index 000000000..c016325d0 --- /dev/null +++ b/app/views/timebands/new.html.erb @@ -0,0 +1,3 @@ +<%= title_tag t('timebands.new.title') %> + +<%= render "form" %> diff --git a/app/views/timebands/show.html.erb b/app/views/timebands/show.html.erb new file mode 100644 index 000000000..1a6171712 --- /dev/null +++ b/app/views/timebands/show.html.erb @@ -0,0 +1,12 @@ +<%= title_tag t( 'timebands.show.title', timeband: @timeband.name )%> + +
    +

    + + <%= l(@timeband.start_time, format: :hour) %> + - + <%= l(@timeband.end_time, format: :hour) %> +

    +
    + +<%= render 'sidebar' %> -- cgit v1.2.3