From dfd08c9868942f31040f1518a09500ef398e4509 Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Wed, 15 Feb 2012 12:19:35 +0100 Subject: Add network and company model --- app/views/companies/_form.erb | 18 +++++++++++++ app/views/companies/_line.erb | 11 ++++++++ app/views/companies/edit.html.erb | 3 +++ app/views/companies/index.html.erb | 17 ++++++++++++ app/views/companies/new.html.erb | 3 +++ app/views/companies/show.html.erb | 47 ++++++++++++++++++++++++++++++++++ app/views/layouts/application.html.erb | 9 ++++++- app/views/networks/_form.erb | 17 ++++++++++++ app/views/networks/_form.erb~ | 18 +++++++++++++ app/views/networks/_line.erb~ | 11 ++++++++ app/views/networks/_network.erb | 6 +++++ app/views/networks/edit.html.erb | 3 +++ app/views/networks/edit.html.erb~ | 3 +++ app/views/networks/index.html.erb | 10 ++++++++ app/views/networks/index.html.erb~ | 17 ++++++++++++ app/views/networks/new.html.erb | 3 +++ app/views/networks/new.html.erb~ | 3 +++ app/views/networks/show.html.erb | 47 ++++++++++++++++++++++++++++++++++ app/views/networks/show.html.erb~ | 47 ++++++++++++++++++++++++++++++++++ 19 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 app/views/companies/_form.erb create mode 100644 app/views/companies/_line.erb create mode 100644 app/views/companies/edit.html.erb create mode 100644 app/views/companies/index.html.erb create mode 100644 app/views/companies/new.html.erb create mode 100644 app/views/companies/show.html.erb create mode 100644 app/views/networks/_form.erb create mode 100644 app/views/networks/_form.erb~ create mode 100644 app/views/networks/_line.erb~ create mode 100644 app/views/networks/_network.erb create mode 100644 app/views/networks/edit.html.erb create mode 100644 app/views/networks/edit.html.erb~ create mode 100644 app/views/networks/index.html.erb create mode 100644 app/views/networks/index.html.erb~ create mode 100644 app/views/networks/new.html.erb create mode 100644 app/views/networks/new.html.erb~ create mode 100644 app/views/networks/show.html.erb create mode 100644 app/views/networks/show.html.erb~ (limited to 'app/views') diff --git a/app/views/companies/_form.erb b/app/views/companies/_form.erb new file mode 100644 index 000000000..19a3b8b84 --- /dev/null +++ b/app/views/companies/_form.erb @@ -0,0 +1,18 @@ +<%= semantic_form_for [@referential, @line] do |form| %> + <%= form.inputs do %> + <%= form.input :network, :as => :select, :collection => Chouette::Network.all, :include_blank => false %> + <%= form.input :company, :as => :select, :collection => Chouette::Company.all, :include_blank => false%> + <%= form.input :registrationnumber %> + <%= form.input :name %> + <%= form.input :publishedname %> + <%= form.input :number %> + <%= form.input :transportmodename, :as => :select, :collection => Chouette::TransportMode.definitions, :include_blank => false, :member_label => Proc.new { |a| t("#{a[0]}") } %> + <%= form.input :comment, :as => :text %> + <% end %> + + <%= form.buttons do %> + <%= form.commit_button true %> +
  • <%= t('or') %>
    • +
  • <%= link_to t('back'), :back %>
    • + <% end %> +<% end %> diff --git a/app/views/companies/_line.erb b/app/views/companies/_line.erb new file mode 100644 index 000000000..f594c7f9d --- /dev/null +++ b/app/views/companies/_line.erb @@ -0,0 +1,11 @@ +<%= div_for(line) do %> + <%= link_to([@referential, line], :class => "preview") do %> +
    +
    <%= line.number %>
    +
    + <% end %> + <%= link_to line.name, [@referential, line] %> +
    + +
    +<% end %> diff --git a/app/views/companies/edit.html.erb b/app/views/companies/edit.html.erb new file mode 100644 index 000000000..491a821fa --- /dev/null +++ b/app/views/companies/edit.html.erb @@ -0,0 +1,3 @@ +<%= title_tag "Modifier la Ligne #{@line.name}" %> + +<%= render "form" %> diff --git a/app/views/companies/index.html.erb b/app/views/companies/index.html.erb new file mode 100644 index 000000000..03f5331e0 --- /dev/null +++ b/app/views/companies/index.html.erb @@ -0,0 +1,17 @@ +
    + Trier par + <%= link_to_order "Code", "code" %> | + <%= link_to_order "Priorité", "priority" %> | + <%= link_to_order "Nom", "name" %> +
    + +<%= title_tag Chouette::Line.model_name.human.pluralize %> + +<%= render :partial => "line", :collection => @lines %> + +<% content_for :sidebar do %> + +<% end %> diff --git a/app/views/companies/new.html.erb b/app/views/companies/new.html.erb new file mode 100644 index 000000000..d580a2aae --- /dev/null +++ b/app/views/companies/new.html.erb @@ -0,0 +1,3 @@ +<%= title_tag "Créer la Ligne" %> + +<%= render "form" %> diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb new file mode 100644 index 000000000..f0d987d3f --- /dev/null +++ b/app/views/companies/show.html.erb @@ -0,0 +1,47 @@ +<%= title_tag @line.name %> + +
    + +
    +

    + + <%= @line.network.name if @line.network.present? %> +

    +

    + + <%= @line.company.name if @line.company.present? %> +

    +

    + + <%= @line.registrationnumber %> +

    +

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

    +

    + + <%= @line.publishedname %> +

    +

    + + <%= @line.number %> +

    +

    + + <%= @line.transportmodename %> +

    +

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

    +
    +
    + +<% content_for :sidebar do %> + +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7e0460ebb..50633675d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,7 +16,14 @@
    diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb new file mode 100644 index 000000000..877e238bf --- /dev/null +++ b/app/views/networks/_form.erb @@ -0,0 +1,17 @@ +<%= semantic_form_for [@referential, @network] do |form| %> + <%= form.inputs do %> + <%= form.input :name %> + <%= form.input :registration_number %> + <%= form.input :comment, :as => :text %> + <%= form.input :version_date %> + <%= form.input :description, :as => :text %> + <%= form.input :source_name, :as => :text %> + <%= form.input :source_identifier, :as => :text %> + <% end %> + + <%= form.buttons do %> + <%= form.commit_button %> +
  • <%= t('or') %>
    • +
  • <%= link_to t('back'), :back %>
    • + <% end %> +<% end %> diff --git a/app/views/networks/_form.erb~ b/app/views/networks/_form.erb~ new file mode 100644 index 000000000..19a3b8b84 --- /dev/null +++ b/app/views/networks/_form.erb~ @@ -0,0 +1,18 @@ +<%= semantic_form_for [@referential, @line] do |form| %> + <%= form.inputs do %> + <%= form.input :network, :as => :select, :collection => Chouette::Network.all, :include_blank => false %> + <%= form.input :company, :as => :select, :collection => Chouette::Company.all, :include_blank => false%> + <%= form.input :registrationnumber %> + <%= form.input :name %> + <%= form.input :publishedname %> + <%= form.input :number %> + <%= form.input :transportmodename, :as => :select, :collection => Chouette::TransportMode.definitions, :include_blank => false, :member_label => Proc.new { |a| t("#{a[0]}") } %> + <%= form.input :comment, :as => :text %> + <% end %> + + <%= form.buttons do %> + <%= form.commit_button true %> +
  • <%= t('or') %>
    • +
  • <%= link_to t('back'), :back %>
    • + <% end %> +<% end %> diff --git a/app/views/networks/_line.erb~ b/app/views/networks/_line.erb~ new file mode 100644 index 000000000..f594c7f9d --- /dev/null +++ b/app/views/networks/_line.erb~ @@ -0,0 +1,11 @@ +<%= div_for(line) do %> + <%= link_to([@referential, line], :class => "preview") do %> +
    +
    <%= line.number %>
    +
    + <% end %> + <%= link_to line.name, [@referential, line] %> +
    + +
    +<% end %> diff --git a/app/views/networks/_network.erb b/app/views/networks/_network.erb new file mode 100644 index 000000000..4adf6896b --- /dev/null +++ b/app/views/networks/_network.erb @@ -0,0 +1,6 @@ +<%= div_for(network) do %> + <%= link_to network.name, [@referential, network] %> +
    + +
    +<% end %> diff --git a/app/views/networks/edit.html.erb b/app/views/networks/edit.html.erb new file mode 100644 index 000000000..90ffef291 --- /dev/null +++ b/app/views/networks/edit.html.erb @@ -0,0 +1,3 @@ +<%= title_tag t('networks.index.title'), {@line.name} %> + +<%= render "form" %> diff --git a/app/views/networks/edit.html.erb~ b/app/views/networks/edit.html.erb~ new file mode 100644 index 000000000..491a821fa --- /dev/null +++ b/app/views/networks/edit.html.erb~ @@ -0,0 +1,3 @@ +<%= title_tag "Modifier la Ligne #{@line.name}" %> + +<%= render "form" %> diff --git a/app/views/networks/index.html.erb b/app/views/networks/index.html.erb new file mode 100644 index 000000000..3743a1865 --- /dev/null +++ b/app/views/networks/index.html.erb @@ -0,0 +1,10 @@ +<%= title_tag t('networks.index.title') %> + +<%= render :partial => "network", :collection => @networks %> + +<% content_for :sidebar do %> + +<% end %> diff --git a/app/views/networks/index.html.erb~ b/app/views/networks/index.html.erb~ new file mode 100644 index 000000000..03f5331e0 --- /dev/null +++ b/app/views/networks/index.html.erb~ @@ -0,0 +1,17 @@ +
    + Trier par + <%= link_to_order "Code", "code" %> | + <%= link_to_order "Priorité", "priority" %> | + <%= link_to_order "Nom", "name" %> +
    + +<%= title_tag Chouette::Line.model_name.human.pluralize %> + +<%= render :partial => "line", :collection => @lines %> + +<% content_for :sidebar do %> + +<% end %> diff --git a/app/views/networks/new.html.erb b/app/views/networks/new.html.erb new file mode 100644 index 000000000..749beb197 --- /dev/null +++ b/app/views/networks/new.html.erb @@ -0,0 +1,3 @@ +<%= title_tag t('networks.new.title') %> + +<%= render "form" %> diff --git a/app/views/networks/new.html.erb~ b/app/views/networks/new.html.erb~ new file mode 100644 index 000000000..d580a2aae --- /dev/null +++ b/app/views/networks/new.html.erb~ @@ -0,0 +1,3 @@ +<%= title_tag "Créer la Ligne" %> + +<%= render "form" %> diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb new file mode 100644 index 000000000..478d2f8aa --- /dev/null +++ b/app/views/networks/show.html.erb @@ -0,0 +1,47 @@ +<%= title_tag t('networks.show.title'), @line.name %> + +
    + +
    +

    + + <%= @line.network.name if @line.network.present? %> +

    +

    + + <%= @line.company.name if @line.company.present? %> +

    +

    + + <%= @line.registrationnumber %> +

    +

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

    +

    + + <%= @line.publishedname %> +

    +

    + + <%= @line.number %> +

    +

    + + <%= @line.transportmodename %> +

    +

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

    +
    +
    + +<% content_for :sidebar do %> + +<% end %> diff --git a/app/views/networks/show.html.erb~ b/app/views/networks/show.html.erb~ new file mode 100644 index 000000000..f0d987d3f --- /dev/null +++ b/app/views/networks/show.html.erb~ @@ -0,0 +1,47 @@ +<%= title_tag @line.name %> + +
    + +
    +

    + + <%= @line.network.name if @line.network.present? %> +

    +

    + + <%= @line.company.name if @line.company.present? %> +

    +

    + + <%= @line.registrationnumber %> +

    +

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

    +

    + + <%= @line.publishedname %> +

    +

    + + <%= @line.number %> +

    +

    + + <%= @line.transportmodename %> +

    +

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

    +
    +
    + +<% content_for :sidebar do %> + +<% end %> -- cgit v1.2.3