From 7fd20ad1409398e06fb1167332c57b4ac4c9aadc Mon Sep 17 00:00:00 2001 From: Marc Florisson Date: Fri, 1 Jun 2012 12:20:36 +0200 Subject: refactor table and column names --- app/views/journey_patterns/_form.html.erb | 24 +++++++++ .../journey_patterns/_journey_pattern.html.erb | 14 +++++ app/views/journey_patterns/edit.html.erb | 4 ++ app/views/journey_patterns/new.html.erb | 4 ++ app/views/journey_patterns/show.html.erb | 62 ++++++++++++++++++++++ app/views/journey_patterns/show.kml.erb | 21 ++++++++ 6 files changed, 129 insertions(+) create mode 100644 app/views/journey_patterns/_form.html.erb create mode 100644 app/views/journey_patterns/_journey_pattern.html.erb create mode 100644 app/views/journey_patterns/edit.html.erb create mode 100644 app/views/journey_patterns/new.html.erb create mode 100644 app/views/journey_patterns/show.html.erb create mode 100644 app/views/journey_patterns/show.kml.erb (limited to 'app/views/journey_patterns') diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb new file mode 100644 index 000000000..ef2bcc9d2 --- /dev/null +++ b/app/views/journey_patterns/_form.html.erb @@ -0,0 +1,24 @@ +<%= semantic_form_for [@referential, @line, @route, @journey_pattern] do |form| %> + <%= form.inputs do %> + <%= form.input :name %> + <%= form.input :published_name %> + <%= form.input :registration_number %> + <%= form.input :comment %> + <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]} %> + <% if @route.new_record? %> + <%= form.input :objectid %> + <% else %> +
  • + + <%= @journey_pattern.objectid %> +
    • + <% end %> + <% end %> + + <%= form.buttons do %> + <%= form.commit_button true %> +
  • <%= t('or') %>
    • +
  • <%= link_to t('cancel'), :back %>
    • + <% end %> +<% end %> + diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb new file mode 100644 index 000000000..1d4130f07 --- /dev/null +++ b/app/views/journey_patterns/_journey_pattern.html.erb @@ -0,0 +1,14 @@ +<%= div_for(journey_pattern) do %> + <%= link_to journey_name(journey_pattern), [@referential, @line, @route, journey_pattern] %> +
    + <% unless journey_pattern.name.blank? %> + <%= t('.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, :arrival => journey_pattern.stop_points.last.stop_area.name) %> - + <% end %> + <%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> - + <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %> +
    + <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :confirm => t('journey_patterns.actions.destroy_confirm'), :class => "remove" %> +
    +
    +<% end %> + diff --git a/app/views/journey_patterns/edit.html.erb b/app/views/journey_patterns/edit.html.erb new file mode 100644 index 000000000..33fac2a6c --- /dev/null +++ b/app/views/journey_patterns/edit.html.erb @@ -0,0 +1,4 @@ +<%= title_tag t('journey_patterns.edit.title', :journey_pattern => @journey_pattern.name ) %> + +<%= render "form" %> + diff --git a/app/views/journey_patterns/new.html.erb b/app/views/journey_patterns/new.html.erb new file mode 100644 index 000000000..fb6ecbd64 --- /dev/null +++ b/app/views/journey_patterns/new.html.erb @@ -0,0 +1,4 @@ +<%= title_tag t('journey_patterns.new.title') %> + +<%= render "form" %> + diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb new file mode 100644 index 000000000..eed065f2f --- /dev/null +++ b/app/views/journey_patterns/show.html.erb @@ -0,0 +1,62 @@ +<%= title_tag t('journey_patterns.show.title', :journey_pattern => journey_name( @journey_pattern), :route => @route.name ) %> + +
    + +
    +

    + + <%= link_to @route.name, [@referential, @line, @route] %> +

    +

    + + <%= @journey_pattern.name %> +

    +

    + + <%= @journey_pattern.published_name %> +

    +

    + + <%= @journey_pattern.registration_number %> +

    +

    + + <%= @journey_pattern.comment %> +

    +

    + + <%= @journey_pattern.objectid %> +

    +

    + + <%= l @journey_pattern.creation_time %> +

    +

    + + <%= @journey_pattern.creator_id %> +

    +
    + +
    + +

    <%= t('.stop_points') %>

    + +
    + <%= render :partial => "stop_points/stop_point", :collection => @stop_points %> +
    + + +<% content_for :sidebar do %> + +<% end %> + diff --git a/app/views/journey_patterns/show.kml.erb b/app/views/journey_patterns/show.kml.erb new file mode 100644 index 000000000..6fd8900b6 --- /dev/null +++ b/app/views/journey_patterns/show.kml.erb @@ -0,0 +1,21 @@ + + + + + <%= @journey_pattenr.name %> + <%= @journey_pattenr.geometry.kml_representation.html_safe %> + + <% @journey_pattenr.stop_areas.where("latitude is not null and longitude is not null").each_with_index do |stop_area, index| %> + + <%= "#{stop_area.name} (#{index+1})" %> + <% if stop_area.id==@journey_pattenr.stop_areas.first.id %> + true + <% elsif stop_area.id==@journey_pattenr.stop_areas.last.id %> + true + <% end %> + <%= stop_area.geometry.kml_representation.html_safe %> + + <% end %> + + + -- cgit v1.2.3