diff options
| author | jpl | 2016-08-04 15:18:54 +0200 |
|---|---|---|
| committer | jpl | 2016-08-04 15:18:54 +0200 |
| commit | 54526c007f4c904ab0edf76768af87bb0f331d71 (patch) | |
| tree | 037dd258467af849e563af742f1ce6305b405c8c | |
| parent | 9f80af81fede1c1dbbb0f4c31f14f8ce39240d1f (diff) | |
| download | chouette-core-54526c007f4c904ab0edf76768af87bb0f331d71.tar.bz2 | |
Refs #1295: convert erb to slim (time_tables)
32 files changed, 391 insertions, 473 deletions
diff --git a/app/views/time_tables/_date_fields.erb b/app/views/time_tables/_date_fields.erb deleted file mode 100644 index 2702e8e52..000000000 --- a/app/views/time_tables/_date_fields.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%= f.inputs :class => 'nested-fields date' do %> - <%= f.label @time_table.human_attribute_name("date"), :class => 'col-md-1' %> - <%= f.input :date, :as => :date_picker, :label => false, :input_html => { :class => 'form-control col-md-3' }%> - <%= f.input :in_out, :as => :hidden, :input_html => {:value => true} %> - <%= link_to_remove_association t('actions.destroy'), f, :class => "col-md-3" %> -<% end %> diff --git a/app/views/time_tables/_date_fields.html.slim b/app/views/time_tables/_date_fields.html.slim new file mode 100644 index 000000000..f17fcaa2c --- /dev/null +++ b/app/views/time_tables/_date_fields.html.slim @@ -0,0 +1,5 @@ += f.inputs class: 'nested-fields date' do + = f.label @time_table.human_attribute_name("date"), class: 'col-md-1' + = f.input :date, as: :date_picker, :label => false, :input_html => { class: 'form-control col-md-3' } + = f.input :in_out, as: :hidden, :input_html => {:value => true} + = link_to_remove_association t('actions.destroy'), f, class: "col-md-3"
\ No newline at end of file diff --git a/app/views/time_tables/_dates.html.erb b/app/views/time_tables/_dates.html.erb deleted file mode 100644 index c6af6ee8c..000000000 --- a/app/views/time_tables/_dates.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - <ul class='dates'> - <% @time_table.dates.where("in_out = true").to_a.each do |tmd| %> - <li class="<%= (tmd.position%2==0) ? 'odd' : 'even' %>"><%= l tmd.date %> - </li> - <% end %> - </ul> - diff --git a/app/views/time_tables/_dates.html.slim b/app/views/time_tables/_dates.html.slim new file mode 100644 index 000000000..0e625b9e5 --- /dev/null +++ b/app/views/time_tables/_dates.html.slim @@ -0,0 +1,4 @@ +ul.dates + - @time_table.dates.where("in_out = true").to_a.each do |tmd| + li class="#{(tmd.position%2==0) ? 'odd' : 'even'}" + = l tmd.date
\ No newline at end of file diff --git a/app/views/time_tables/_excluded_date_fields.erb b/app/views/time_tables/_excluded_date_fields.erb deleted file mode 100644 index 2302cb711..000000000 --- a/app/views/time_tables/_excluded_date_fields.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%= f.inputs :class => 'nested-fields date' do %> - <%= f.label @time_table.human_attribute_name("date"), :class => 'col-md-1' %> - <%= f.input :date, :as => :date_picker, :label => false, :input_html => { :class => 'form-control col-md-3' } %> - <%= f.input :in_out, :as => :hidden, :input_html => {:value => false} %> - <%= link_to_remove_association t('actions.destroy'), f, :class => "col-md-3" %> -<% end %> diff --git a/app/views/time_tables/_excluded_date_fields.html.slim b/app/views/time_tables/_excluded_date_fields.html.slim new file mode 100644 index 000000000..294d103fc --- /dev/null +++ b/app/views/time_tables/_excluded_date_fields.html.slim @@ -0,0 +1,5 @@ += f.inputs class: 'nested-fields date' do + = f.label @time_table.human_attribute_name("date"), class: 'col-md-1' + = f.input :date, as: :date_picker, :label => false, :input_html => { class: 'form-control col-md-3' } + = f.input :in_out, as: :hidden, :input_html => {:value => false} + = link_to_remove_association t('actions.destroy'), f, class: "col-md-3"
\ No newline at end of file diff --git a/app/views/time_tables/_excluded_dates.html.erb b/app/views/time_tables/_excluded_dates.html.erb deleted file mode 100644 index 8097c618f..000000000 --- a/app/views/time_tables/_excluded_dates.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - <ul class='dates'> - <% @time_table.dates.where("in_out = false").to_a.each do |tmd| %> - <li class="<%= (tmd.position%2==0) ? 'odd' : 'even' %>"><%= l tmd.date %> - </li> - <% end %> - </ul> - diff --git a/app/views/time_tables/_excluded_dates.html.slim b/app/views/time_tables/_excluded_dates.html.slim new file mode 100644 index 000000000..31b9e35f0 --- /dev/null +++ b/app/views/time_tables/_excluded_dates.html.slim @@ -0,0 +1,4 @@ +ul.dates + - @time_table.dates.where("in_out = false").to_a.each do |tmd| + li class="#{(tmd.position%2==0) ? 'odd' : 'even'}" + = l tmd.date
\ No newline at end of file diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb deleted file mode 100644 index 8cd614fa6..000000000 --- a/app/views/time_tables/_form.erb +++ /dev/null @@ -1,91 +0,0 @@ -<%= semantic_form_for [@referential, @time_table] do |form| %> - <%= form.inputs do %> - <%= form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")} %> - <%= form.input :version %> - <%= form.input :tag_search, :as => :tags, :input_html => { :id => "tag_search",:placeholder => t("formtastic.placeholders.time_table.tag_search") } %> - <%= form.input :tag_list, :as => :hidden, :input_html => { :id => "tag_list" } %> - - <%= form.input :objectid, :required => !@time_table.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.objectid")} %> - <% end %> - - <h3 class="time_table_periods"><%= @time_table.human_attribute_name("periods") %></h3> - <div id="periods_content"> - <%= form.inputs :class => 'day_type' do %> - <label class="day_type_label"><%= @time_table.human_attribute_name("day_types") %></label> - <%= form.input :monday, :as => :boolean, :class => "others" %> - <%= form.input :tuesday, :as => :boolean %> - <%= form.input :wednesday, :as => :boolean %> - <%= form.input :thursday, :as => :boolean %> - <%= form.input :friday, :as => :boolean %> - <%= form.input :saturday, :as => :boolean %> - <%= form.input :sunday, :as => :boolean %> - <% end %> - <div id="periods"> - <%= form.semantic_fields_for :periods do |p| %> - <%= render "period_fields", :f => p %> - <% end %> - </div> - <%= link_to_add_association t("time_tables.actions.add_period"), form, :periods , - :"data-association-insertion-method" => "append", - :"data-association-insertion-node" => "div#periods"%> - </div> - - <h3 class="time_table_dates"><%= @time_table.human_attribute_name("dates") %></h3> - <div id="dates_content"> - <div id="dates"> - <%= form.semantic_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == true} do |p| %> - <%= render "date_fields", :f => p %> - <% end %> - </div> - <%= link_to_add_association t("time_tables.actions.add_date"), form, :dates , - :"data-association-insertion-method" => "append", - :"partial" => "date_fields", - :"data-association-insertion-node" => "div#dates" %> - </div> - - <h3 class="time_table_dates"><%= @time_table.human_attribute_name("excluded_dates") %></h3> - <div id="excluded_dates_content"> - <div id="excluded_dates"> - <%= form.semantic_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == false} do |p| %> - <%= render "excluded_date_fields", :f => p %> - <% end %> - </div> - <%= link_to_add_association t("time_tables.actions.add_excluded_date"), form, :dates , - :"data-association-insertion-method" => "append", - :"partial" => "excluded_date_fields", - :"data-association-insertion-node" => "div#excluded_dates" %> - </div> - - <%= form.actions do %> - <%= form.action :submit, :as => :button %> - <%= form.action :cancel, :as => :link %> - <% end %> -<% end %> - -<%= javascript_tag "var items = #{ @time_table.tag_list.to_a };" %> - -<script> - $("#tag_search").tagsManager( - { - prefilled: items, - output: '#tag_list', - tagsContainer: '#tagsContainer' - }); - - var time_tables_tag_list = new Bloodhound({ - datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), - queryTokenizer: Bloodhound.tokenizers.whitespace, - remote: '<%= tags_referential_time_tables_path(@referential, :format => 'json') %>?tag=%QUERY', - }); - - time_tables_tag_list.initialize(); - - $("#tag_search").typeahead(null, { - name: 'time_tables_tag_list', - displayKey: 'name', - source: time_tables_tag_list.ttAdapter() - }); - -</script> - - diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim new file mode 100644 index 000000000..7194ce363 --- /dev/null +++ b/app/views/time_tables/_form.html.slim @@ -0,0 +1,71 @@ += semantic_form_for [@referential, @time_table] do |form| + = form.inputs do + = form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")} + = form.input :version + = form.input :tag_search, as: :tags, :input_html => { :id => "tag_search",:placeholder => t("formtastic.placeholders.time_table.tag_search") } + = form.input :tag_list, as: :hidden, :input_html => { :id => "tag_list" } + = form.input :objectid, :required => !@time_table.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.objectid")} + + h3.time_table_periods = @time_table.human_attribute_name("periods") + + #periods_content + = form.inputs class: 'day_type' do + label.day_type_label = @time_table.human_attribute_name("day_types") + = form.input :monday, as: :boolean, class: "others" + = form.input :tuesday, as: :boolean + = form.input :wednesday, as: :boolean + = form.input :thursday, as: :boolean + = form.input :friday, as: :boolean + = form.input :saturday, as: :boolean + = form.input :sunday, as: :boolean + + #periods + = form.semantic_fields_for :periods do |p| + == render "period_fields", :f => p + + = link_to_add_association t("time_tables.actions.add_period"), form, :periods , :"data-association-insertion-method" => "append", :"data-association-insertion-node" => "div#periods" + + h3.time_table_dates = @time_table.human_attribute_name("dates") + + #dates_content + #dates + = form.semantic_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == true} do |p| + == render "date_fields", :f => p + + = link_to_add_association t("time_tables.actions.add_date"), form, :dates, :"data-association-insertion-method" => "append", :"partial" => "date_fields", :"data-association-insertion-node" => "div#dates" + + h3.time_table_dates = @time_table.human_attribute_name("excluded_dates") + + #excluded_dates_content + #excluded_dates + = form.semantic_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == false} do |p| + == render "excluded_date_fields", :f => p + + = link_to_add_association t("time_tables.actions.add_excluded_date"), form, :dates, :"data-association-insertion-method" => "append", :"partial" => "excluded_date_fields", :"data-association-insertion-node" => "div#excluded_dates" + + = form.actions do + = form.action :submit, as: :button + = form.action :cancel, as: :link + += javascript_tag "var items = #{ @time_table.tag_list.to_a };" + +javascript: + $("#tag_search").tagsManager({ + prefilled: items, + output: '#tag_list', + tagsContainer: '#tagsContainer' + }); + + var time_tables_tag_list = new Bloodhound({ + datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'), + queryTokenizer: Bloodhound.tokenizers.whitespace, + remote: "#{tags_referential_time_tables_path(@referential, format: 'json')}?tag=%QUERY", + }); + + time_tables_tag_list.initialize(); + + $("#tag_search").typeahead(null, { + name: 'time_tables_tag_list', + displayKey: 'name', + source: time_tables_tag_list.ttAdapter() + });
\ No newline at end of file diff --git a/app/views/time_tables/_period_fields.erb b/app/views/time_tables/_period_fields.erb deleted file mode 100644 index 0094008f1..000000000 --- a/app/views/time_tables/_period_fields.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= f.inputs :class => 'nested-fields period' do %> - <%= f.label @time_table.human_attribute_name("period_start"), :class => "col-md-1" %> - <%= f.input :period_start, :as => :date_picker, :label => false, :input_html => { :class => 'form-control col-md-3' }%> - <%= f.label @time_table.human_attribute_name("period_end"), :class => "col-md-1" %> - <%= f.input :period_end, :as => :date_picker, :label => false, :input_html => { :class => 'form-control col-md-3' }%> - <%= link_to_remove_association t('actions.destroy'), f, :class => "col-md-2" %> -<% end %> diff --git a/app/views/time_tables/_period_fields.html.slim b/app/views/time_tables/_period_fields.html.slim new file mode 100644 index 000000000..cefa68df5 --- /dev/null +++ b/app/views/time_tables/_period_fields.html.slim @@ -0,0 +1,8 @@ += f.inputs class: 'nested-fields period' do + = f.label @time_table.human_attribute_name("period_start"), class: "col-md-1" + = f.input :period_start, as: :date_picker, :label => false, :input_html => { class: 'form-control col-md-3' } + + = f.label @time_table.human_attribute_name("period_end"), class: "col-md-1" + = f.input :period_end, as: :date_picker, :label => false, :input_html => { class: 'form-control col-md-3' } + + = link_to_remove_association t('actions.destroy'), f, class: "col-md-2"
\ No newline at end of file diff --git a/app/views/time_tables/_periods.html.erb b/app/views/time_tables/_periods.html.erb deleted file mode 100644 index 1f0aea057..000000000 --- a/app/views/time_tables/_periods.html.erb +++ /dev/null @@ -1,7 +0,0 @@ - <ul class='periods'> - <% @time_table.periods.each do |tmp| %> - <li class='period'><%= t('time_tables.show.from')%> <%= l tmp.period_start %> <%= t('time_tables.show.to')%> <%= l tmp.period_end %> - </li> - <% end %> - </ul> - diff --git a/app/views/time_tables/_periods.html.slim b/app/views/time_tables/_periods.html.slim new file mode 100644 index 000000000..e3c6d5f39 --- /dev/null +++ b/app/views/time_tables/_periods.html.slim @@ -0,0 +1,5 @@ +ul.periods + - @time_table.periods.each do |tmp| + li.period + = "#{('time_tables.show.from')} #{l tmp.period_start}" + = "#{t('time_tables.show.to')} #{l tmp.period_end}"
\ No newline at end of file diff --git a/app/views/time_tables/_properties_show.html.erb b/app/views/time_tables/_properties_show.html.erb deleted file mode 100644 index bc2f88ddf..000000000 --- a/app/views/time_tables/_properties_show.html.erb +++ /dev/null @@ -1,127 +0,0 @@ -<div class="time_table_show"> - - <div class="resume"> - <div class="validity <%= time_table_state_code(@time_table) %>"></div> - <label> - <% if @time_table.bounding_dates.empty? %> - <%= t(".resume_empty") %> - <% else %> - <%= t(".resume", :start_date => l(@time_table.bounding_dates.min), - :end_date => l(@time_table.bounding_dates.max)) %> - <% end %> - </label> - </div> - <div class="summary"> - <p> - <label><%= @time_table.human_attribute_name("version") %>: </label> - <%= @time_table.version %> - </p> - <p> - <label><%= @time_table.human_attribute_name("tag_list") %>: </label> - <%= @time_table.tag_list %> - </p> - <p> - <label><%= @time_table.human_attribute_name("day_types") %>: </label> - <% if @time_table.int_day_types & 508 == 0 %> - <label><%= @time_table.human_attribute_name("none") %></label> - <% else %> - <% if @time_table.monday %> - <span class='day_type'> <%= @time_table.human_attribute_name("monday") %> </span> - <% end %> - - <% if @time_table.tuesday %> - <span class='day_type'> <%= @time_table.human_attribute_name("tuesday") %> </span> - <% end %> - - <% if @time_table.wednesday %> - <span class='day_type'> <%= @time_table.human_attribute_name("wednesday") %> </span> - <% end %> - - <% if @time_table.thursday %> - <span class='day_type'> <%= @time_table.human_attribute_name("thursday") %> </span> - <% end %> - - <% if @time_table.friday %> - <span class='day_type'> <%= @time_table.human_attribute_name("friday") %> </span> - <% end %> - - <% if @time_table.saturday %> - <span class='day_type'> <%= @time_table.human_attribute_name("saturday") %> </span> - <% end %> - - <% if @time_table.sunday %> - <span class='day_type'> <%= @time_table.human_attribute_name("sunday") %> </span> - <% end %> - <% end %> - </p> - - <h3 class="time_table_calendars"> - <a class="calendars"><%= @time_table.human_attribute_name("calendars") %> - <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %> - <%= image_tag("icons/minus.png" , :class => "switcher" ) %> - </a> - - </h3> - <div class="calendars content"> - <div class="year_choice"> - <span class="previous"> <%= link_to("<", referential_time_table_path(@referential, @time_table, :year => (@year - 1)) ) %> </span> - <span class="year"> <%= "#{@year}" %> </span> - <span class="next"> <%= link_to(">", referential_time_table_path(@referential, @time_table, :year => (@year + 1)) ) %> </span> - </div> - <div class="calendar_helper"> - <%= cal = "" - (1..12).each do |month| - cal << calendar(:year => @year, :month => month, :first_day_of_week => 1) do |d| - if @time_table.excluded_date?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "excluded_date"}] - elsif @time_table.include_in_overlap_dates?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "overlap_date"}] - elsif @time_table.include_in_dates?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "selected_date"}] - elsif @time_table.include_in_periods?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "selected_period"}] - end - end - end - cal.html_safe - %> - </div> - </div> - - - </div> - <h3 class="time_table_periods"> - <a class="periods"><%= @time_table.human_attribute_name("periods") %> - <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %> - <%= image_tag("icons/minus.png" , :class => "switcher" ) %> - </a> - - </h3> - <div class="periods content"> - <%= render "time_tables/periods" %> - </div> - - <h3 class="time_table_dates"> - <a class="dates"><%= @time_table.human_attribute_name("dates") %> - <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %> - <%= image_tag("icons/minus.png" , :class => "switcher" ) %> - </a> - </h3> - - <div class="dates content"> - <%= render "time_tables/dates" %> - </div> - - <h3 class="time_table_dates"> - <a class="excluded_dates"><%= @time_table.human_attribute_name("excluded_dates") %> - <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %> - <%= image_tag("icons/minus.png" , :class => "switcher" ) %> - </a> - </h3> - - <div class="excluded_dates content"> - <%= render "time_tables/excluded_dates" %> - </div> - -</div> - diff --git a/app/views/time_tables/_properties_show.html.slim b/app/views/time_tables/_properties_show.html.slim new file mode 100644 index 000000000..43313afc1 --- /dev/null +++ b/app/views/time_tables/_properties_show.html.slim @@ -0,0 +1,99 @@ +.time_table_show + .resume + div class="validity #{time_table_state_code(@time_table)}" + + label + - if @time_table.bounding_dates.empty? + = t(".resume_empty") + - else + = t(".resume", :start_date => l(@time_table.bounding_dates.min), :end_date => l(@time_table.bounding_dates.max)) + + .summary + p + label = "#{@time_table.human_attribute_name('version')} : " + = @time_table.version + + p + label = "#{@time_table.human_attribute_name('tag_list')} : " + = @time_table.tag_list + + p + label = "#{@time_table.human_attribute_name('day_types')} : " + + - if @time_table.int_day_types & 508 == 0 + label = @time_table.human_attribute_name("none") + - else + - if @time_table.monday + span.day_type = " #{@time_table.human_attribute_name('monday')} " + + - if @time_table.tuesday + span.day_type = " #{@time_table.human_attribute_name('tuesday')} " + + - if @time_table.wednesday + span.day_type = " #{@time_table.human_attribute_name('wednesday')} " + + - if @time_table.thursday + span.day_type = " #{@time_table.human_attribute_name('thursday')} " + + - if @time_table.friday + span.day_type = " #{@time_table.human_attribute_name('friday')} " + + - if @time_table.saturday + span.day_type = " #{@time_table.human_attribute_name('saturday')} " + + - if @time_table.sunday + span.day_type = " #{@time_table.human_attribute_name('sunday')} " + + h3.time_table_calendars + a.calendars + = @time_table.human_attribute_name("calendars") + = image_tag("icons/plus.png" , class: "switcher", :style => "display: none;") + = image_tag("icons/minus.png" , class: "switcher" ) + + .calendars.content + .year_choice + span.previous = link_to("<", referential_time_table_path(@referential, @time_table, :year => (@year - 1)) ) + span.year = "#{@year}" + span.next = link_to(">", referential_time_table_path(@referential, @time_table, :year => (@year + 1)) ) + + .calendar_helper + - cal = "" + - (1..12).each do |month| + - cal << calendar(year: @year, month: month, first_day_of_week: 1) do |d| + - if @time_table.excluded_date?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "excluded_date"}] + - elsif @time_table.include_in_overlap_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "overlap_date"}] + - elsif @time_table.include_in_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "selected_date"}] + - elsif @time_table.include_in_periods?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "selected_period"}] + + = cal.html_safe + + h3.time_table_periods + a.periods + = @time_table.human_attribute_name("periods") + = image_tag("icons/plus.png" , class: "switcher", :style => "display: none;") + = image_tag("icons/minus.png" , class: "switcher" ) + + .periods.content + == render "time_tables/periods" + + h3.time_table_dates + a.dates + = @time_table.human_attribute_name("dates") + = image_tag("icons/plus.png" , class: "switcher", :style => "display: none;") + = image_tag("icons/minus.png" , class: "switcher" ) + + .dates.content + == render "time_tables/dates" + + h3.time_table_dates + a.excluded_dates + = @time_table.human_attribute_name("excluded_dates") + = image_tag("icons/plus.png", class: "switcher", :style => "display: none;") + = image_tag("icons/minus.png", class: "switcher" ) + + .excluded_dates.content + == render "time_tables/excluded_dates"
\ No newline at end of file diff --git a/app/views/time_tables/_show_time_table.html.erb b/app/views/time_tables/_show_time_table.html.erb deleted file mode 100644 index c48b93470..000000000 --- a/app/views/time_tables/_show_time_table.html.erb +++ /dev/null @@ -1,101 +0,0 @@ -<div class="time_table_show" id="time_table_show"> - <p> - <span class="state-code <%= @time_table.presenter.time_table_state_code %>"><i class="fa fa-certificate"></i></span> - <label> - <% if @time_table.bounding_dates.empty? %> - <%= t(".resume_empty") %> - <% else %> - <%= t(".resume", :start_date => l(@time_table.bounding_dates.min), :end_date => l(@time_table.bounding_dates.max)) %> - <% end %> - </label> - </p> - <p> - <label><%= @time_table.human_attribute_name("tag_list") %>: </label> - <%= @time_table.tag_list %> - </p> - <ul id="tabs" class="nav nav-tabs" data-tabs="tabs"> - <li class="active"><a href="#time_tables" data-toggle="tab"><%= @time_table.human_attribute_name("calendars") %></a></li> - <li><a href="#time_tables_datas" data-toggle="tab"><%= @time_table.human_attribute_name("calendar_details") %></a></li> - </ul> - <div id="my-tab-content" class="tab-content"> - <div class="tab-pane active" id="time_tables"> - <div class="well legend"> - <span class="title"><%= t(".legend") %></span> - <span class="label excluded_date">X</span><%= t(".excluded_date") %> - <span class="label overlaped_date">X</span><%= t(".overlap_date") %> - <span class="label selected_date">X</span><%= t(".selected_date") %> - <span class="label selected_period">X</span><%= t(".selected_period") %> - </div> - <div id="calendars"> - <div class="year_choice"> - <span class="previous"> <%= link_to("<", referential_time_table_path(@referential, @time_table, :year => (@year - 1)) ) %> </span> - <span class="year"> <%= "#{@year}" %> </span> - <span class="next"> <%= link_to(">", referential_time_table_path(@referential, @time_table, :year => (@year + 1)) ) %> </span> - </div> - <div class="calendar_helper"> - <%= cal = "" - (1..12).each do |month| - cal << calendar(:year => @year, :month => month, :first_day_of_week => 1) do |d| - if @time_table.excluded_date?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "day excluded_date"}] - elsif @time_table.include_in_overlap_dates?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "day overlaped_date"}] - elsif @time_table.include_in_dates?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "day selected_date"}] - elsif @time_table.include_in_periods?(d) - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {:class => "day selected_period"}] - end - end - end - cal.html_safe - %> - </div> - </div> - </div> - <div class="tab-pane" id="time_tables_datas"> - <div class="summary"> - <p> - <label><%= @time_table.human_attribute_name("version") %>: </label> - <%= @time_table.version %> - </p> - <p> - <label><%= @time_table.human_attribute_name("day_types") %>: </label> - <% if @time_table.int_day_types & 508 == 0 %> - <label><%= @time_table.human_attribute_name("none") %></label> - <% else %> - <% %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| %> - <span class="<%= @time_table.send( day_type) ? "included_day_type" : "excluded_day_type" %>"> - <%= @time_table.human_attribute_name(day_type) %> - </span> - <% end %> - <% end %> - </p> - - </div> - - <% if @time_table.periods.present? %> - <h3 class="time_table_periods"><%= @time_table.human_attribute_name("periods") %></h3> - <div class="periods content"> - <%= render "time_tables/periods" %> - </div> - <% end %> - - <% if @time_table.dates.where("in_out = true").present? %> - <h3 class="time_table_dates"><%= @time_table.human_attribute_name("dates") %></h3> - <div class="dates content"> - <%= render "time_tables/dates" %> - </div> - <% end %> - - <% if @time_table.dates.where("in_out = false").present? %> - <h3 class="time_table_dates"><%= @time_table.human_attribute_name("excluded_dates") %></h3> - <div class="excluded_dates content"> - <%= render "time_tables/excluded_dates" %> - </div> - <% end %> - - </div> - </div> - -</div> - diff --git a/app/views/time_tables/_show_time_table.html.slim b/app/views/time_tables/_show_time_table.html.slim new file mode 100644 index 000000000..ccdc4187f --- /dev/null +++ b/app/views/time_tables/_show_time_table.html.slim @@ -0,0 +1,87 @@ +#time_table_show.time_table_show + p + span class="state-code #{@time_table.presenter.time_table_state_code}" + i.fa.fa-certificate + + label + - if @time_table.bounding_dates.empty? + = t(".resume_empty") + - else + = t(".resume", :start_date => l(@time_table.bounding_dates.min), :end_date => l(@time_table.bounding_dates.max)) + + p + label = "#{@time_table.human_attribute_name('tag_list')} : " + = @time_table.tag_list + + ul.nav.nav-tabs id="tabs" data-tabs="tabs" + li.active + a href="#time_tables" data-toggle="tab" + = @time_table.human_attribute_name("calendars") + + li + a href="#time_tables_datas" data-toggle="tab" + = @time_table.human_attribute_name("calendar_details") + + #my-tab-content.tab-content + #time_tables.tab-pane.active + .well.legend + span.title = t(".legend") + span.label.excluded_date X + = t(".excluded_date") + span.label.overlaped_date X + = t(".overlap_date") + span.label.selected_date X + = t(".selected_date") + span.label.selected_period X + = t(".selected_period") + + #calendars + .year_choice + span.previous = link_to("<", referential_time_table_path(@referential, @time_table, year: (@year - 1)) ) + span.year = "#{@year}" + span.next = link_to(">", referential_time_table_path(@referential, @time_table, year: (@year + 1)) ) + + .calendar_helper + - cal = "" + - (1..12).each do |month| + - cal << calendar(year: @year, month: month, first_day_of_week: 1) do |d| + - if @time_table.excluded_date?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day excluded_date"}] + - elsif @time_table.include_in_overlap_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day overlaped_date"}] + - elsif @time_table.include_in_dates?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_date"}] + - elsif @time_table.include_in_periods?(d) + - [link_to(d.mday, edit_referential_time_table_path(@referential, @time_table) ), {class: "day selected_period"}] + + = cal.html_safe + + #time_tables_datas.tab-pane + .summary + p + label = "#{@time_table.human_attribute_name('version')} : " + = @time_table.version + + p + label = "#{@time_table.human_attribute_name('day_types')} : " + - if @time_table.int_day_types & 508 == 0 + label = "#{@time_table.human_attribute_name('none')} : " + - else + - %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| + span class="#{@time_table.send(day_type) ? 'included_day_type' :'excluded_day_type'}" + = @time_table.human_attribute_name(day_type) + + - if @time_table.periods.present? + h3.time_table_periods = @time_table.human_attribute_name("periods") + .periods.content + == render 'time_tables/periods' + + - if @time_table.dates.where("in_out = true").present? + h3.time_table_dates = @time_table.human_attribute_name("dates") + .dates.content + == render "time_tables/dates" + + - if @time_table.dates.where("in_out = false").present? + h3.time_table_dates = @time_table.human_attribute_name("excluded_dates") + .excluded_dates.content + == render "time_tables/excluded_dates"
\ No newline at end of file diff --git a/app/views/time_tables/_time_table.html.erb b/app/views/time_tables/_time_table.html.erb deleted file mode 100644 index 7f48a9365..000000000 --- a/app/views/time_tables/_time_table.html.erb +++ /dev/null @@ -1,35 +0,0 @@ -<div id="index_item" class="panel panel-default time_table"> - <div class="panel-heading"> - <div class="panel-title clearfix"> - <span class="pull-right"> - <%= link_to edit_referential_time_table_path(@referential, time_table), :class => "btn btn-default btn-sm" do %> - <span class="fa fa-pencil"></span> - <% end %> - <%= link_to('<span class="fa fa-trash-o"></span>'.html_safe, referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm") if delete %> - </span> - <h5> - <%= link_to([@referential, time_table], :class => "preview", :title => "#{Chouette::TimeTable.model_name.human.capitalize} #{time_table.comment}") do %> - <span class="state-code <%= time_table.presenter.time_table_state_code %>"><i class="fa fa-certificate"></i></span> - <span class="name"> - <%= truncate(time_table.comment, :length => 20) %> - </span> - <% end %> - </h5> - </div> - </div> - <div class="panel-body"> - <%= time_table.presenter.time_tables_shortest_info %> - <% unless time_table.periods.empty? %> - <div> - <% %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| %> - <span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type" %>"> - <%= time_table.human_attribute_name(day_type).first(2) %> - </span> - <% end %> - </div> - <% end %> - <% unless time_table.tags.empty? %> - <div><%= time_table.presenter.tag_list_shortened %></div> - <% end %> - </div> -</div> diff --git a/app/views/time_tables/_time_table.html.slim b/app/views/time_tables/_time_table.html.slim new file mode 100644 index 000000000..1e418054e --- /dev/null +++ b/app/views/time_tables/_time_table.html.slim @@ -0,0 +1,30 @@ +#index_item.panel.panel-default.time_table + .panel-heading + .panel-title.clearfix + span.pull-right + = link_to edit_referential_time_table_path(@referential, time_table), class: 'btn btn-default btn-sm' do + span.fa.fa-pencil + + - if delete + = link_to '<span class="fa fa-trash-o"></span>'.html_safe, referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, class: "btn btn-danger btn-sm" + + h5 + = link_to([@referential, time_table], class: "preview", :title => "#{Chouette::TimeTable.model_name.human.capitalize} #{time_table.comment}") do + span.state-code + = time_table.presenter.time_table_state_code + i.fa.fa-certificate + + span.name = truncate(time_table.comment, length: 20) + + .panel-body + = time_table.presenter.time_tables_shortest_info + + - unless time_table.periods.empty? + div + - %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| + span class="#{time_table.send(day_type) ? 'included_day_type' : 'excluded_day_type'}" + = time_table.human_attribute_name(day_type).first(2) + + - unless time_table.tags.empty? + div + = time_table.presenter.tag_list_shortened
\ No newline at end of file diff --git a/app/views/time_tables/_time_tables.html.erb b/app/views/time_tables/_time_tables.html.erb deleted file mode 100644 index 4458f653d..000000000 --- a/app/views/time_tables/_time_tables.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<div class="page_info"> - <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @time_tables %> -</div> -<div class="time_tables paginated_content"> - <%= paginated_content(@time_tables) %> -</div> -<div class="pagination"> - <%= will_paginate @time_tables, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> -</div> diff --git a/app/views/time_tables/_time_tables.html.slim b/app/views/time_tables/_time_tables.html.slim new file mode 100644 index 000000000..182523cfd --- /dev/null +++ b/app/views/time_tables/_time_tables.html.slim @@ -0,0 +1,9 @@ +.page_info + span.search = t("will_paginate.page_entries_info.search") + = page_entries_info @time_tables + +.time_tables.paginated_content + = paginated_content(@time_tables) + +.pagination + = will_paginate @time_tables, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file diff --git a/app/views/time_tables/edit.html.erb b/app/views/time_tables/edit.html.erb deleted file mode 100644 index ac3beaeaa..000000000 --- a/app/views/time_tables/edit.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<%= title_tag t('time_tables.edit.title', :time_table => @time_table.comment) %> - -<%= render "form" %> - diff --git a/app/views/time_tables/edit.html.slim b/app/views/time_tables/edit.html.slim new file mode 100644 index 000000000..1746b48c7 --- /dev/null +++ b/app/views/time_tables/edit.html.slim @@ -0,0 +1,3 @@ += title_tag t('time_tables.edit.title', :time_table => @time_table.comment) + +== render 'form'
\ No newline at end of file diff --git a/app/views/time_tables/index.html.erb b/app/views/time_tables/index.html.erb deleted file mode 100644 index 2163dfa94..000000000 --- a/app/views/time_tables/index.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -<%= title_tag t('time_tables.index.title') %> - -<%= search_form_for @q, :url => referential_time_tables_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| %> -<div class="panel panel-default"> - <div class="panel-heading"> - <div class="input-group col-md-9"> - <%= f.text_field :comment_cont, :placeholder => "#{t('.comment')}", :class => 'form-control' %> - - <div class="input-group-btn"> - <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button> - </div> - </div><!-- /input-group --> - <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> - <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> - </a> - </div> - - <div id="advanced_search" class="panel-collapse collapse"> - <div class="panel-body"> - <div> - <label><%= "#{t('.from')}" %></label> - <%= f.text_field :start_date_gteq, :placeholder => "#{t('.start_date')}", :class => 'form-control date_picker', :type => "date" %> - <label><%= "#{t('.to')}" %></label> - <%= f.text_field :end_date_lteq, :placeholder => "#{t('.end_date')}", :class => 'form-control date_picker', :type => "date" %> - </div> - <div> - <%= f.text_field :tag_search, :placeholder => "#{t('.tag_search')}", :class => 'form-control' %> - </div> - </div> - </div> -</div> -<% end %> - -<div id="time_tables"><%= render 'time_tables' %></div> - - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), :class => "add" %></li> - <br> -</ul> -<% end %> diff --git a/app/views/time_tables/index.html.slim b/app/views/time_tables/index.html.slim new file mode 100644 index 000000000..3a9d1c4ad --- /dev/null +++ b/app/views/time_tables/index.html.slim @@ -0,0 +1,35 @@ += title_tag t('time_tables.index.title') + += search_form_for @q, :url => referential_time_tables_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| + .panel.panel-default + .panel-heading + .input-group.col-md-9 + = f.text_field :comment_cont, :placeholder => "#{t('.comment')}", class: 'form-control' + + .input-group-btn + button.btn.btn-default type="submit" + i.fa.fa-search + + a data-toggle="collapse" data-parent="#search" href="#advanced_search" + i.fa.fa-plus + = "#{t('.advanced_search')}" + + #advanced_search.panel-collapse.collapse + .panel-body + div + label = "#{t('.from')}" + = f.text_field :start_date_gteq, :placeholder => "#{t('.start_date')}", class: 'form-control date_picker', :type => "date" + + label = "#{t('.to')}" + = f.text_field :end_date_lteq, :placeholder => "#{t('.end_date')}", class: 'form-control date_picker', :type => "date" + + div + = f.text_field :tag_search, :placeholder => "#{t('.tag_search')}", class: 'form-control' + +#time_tables + == render 'time_tables' + +- content_for :sidebar do + ul.actions + li = link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), class: "add" + br
\ No newline at end of file diff --git a/app/views/time_tables/index.js.erb b/app/views/time_tables/index.js.erb deleted file mode 100644 index 3b37cde65..000000000 --- a/app/views/time_tables/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#time_tables').html('<%= escape_javascript(render("time_tables")) %>');
\ No newline at end of file diff --git a/app/views/time_tables/index.js.slim b/app/views/time_tables/index.js.slim new file mode 100644 index 000000000..8cdb70084 --- /dev/null +++ b/app/views/time_tables/index.js.slim @@ -0,0 +1 @@ +$('#time_tables').html("#{escape_javascript(render('time_tables'))}");
\ No newline at end of file diff --git a/app/views/time_tables/new.html.erb b/app/views/time_tables/new.html.erb deleted file mode 100644 index 90b9876e2..000000000 --- a/app/views/time_tables/new.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= title_tag t('time_tables.new.title') %> - -<%= render "form" %> diff --git a/app/views/time_tables/new.html.slim b/app/views/time_tables/new.html.slim new file mode 100644 index 000000000..bc15f7032 --- /dev/null +++ b/app/views/time_tables/new.html.slim @@ -0,0 +1,3 @@ += title_tag t('time_tables.new.title') + +== render 'form'
\ No newline at end of file diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb deleted file mode 100644 index 6b2233a55..000000000 --- a/app/views/time_tables/show.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<% require 'calendar_helper' %> - -<%= title_tag t('time_tables.show.title', :time_table => @time_table.comment )%> - -<%= render "time_table_combinations/combine" %> - -<%= render "show_time_table" %> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), :class => "add" %></li> - <li><%= link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), :class => "edit" %></li> - <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, :class => "remove" %></li> - <li><%= link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), :class => "clone" %></li> - <li><%= link_to t('time_tables.actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {:remote => true, 'data-toggle' => "modal", 'data-target' => '#modal_combine', :class => "merge"} %></li> -</ul> - - - <%= creation_tag(@time_table) %> -<% end %> diff --git a/app/views/time_tables/show.html.slim b/app/views/time_tables/show.html.slim new file mode 100644 index 000000000..7eaf24a77 --- /dev/null +++ b/app/views/time_tables/show.html.slim @@ -0,0 +1,22 @@ +- require 'calendar_helper' + += title_tag t('time_tables.show.title', :time_table => @time_table.comment ) + +== render 'time_table_combinations/combine' + +== render 'show_time_table' + +- content_for :sidebar do + ul.actions + li + = link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), class: 'add' + li + = link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), class: "edit" + li + = link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm => t('time_tables.actions.destroy_confirm')}, class: "remove" + li + = link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), class: "clone" + li + = link_to t('time_tables.actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {:remote => true, 'data-toggle' => "modal", 'data-target' => '#modal_combine', class: "merge"} + + = creation_tag(@time_table)
\ No newline at end of file |
