diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb~ | 36 | ||||
| -rw-r--r-- | app/views/lines/_form.erb~ | 13 | ||||
| -rw-r--r-- | app/views/lines/_line.erb~ | 16 | ||||
| -rw-r--r-- | app/views/lines/show.html.erb~ | 45 | ||||
| -rw-r--r-- | app/views/networks/_form.erb~ | 18 | ||||
| -rw-r--r-- | app/views/networks/_line.erb~ | 11 | ||||
| -rw-r--r-- | app/views/networks/edit.html.erb~ | 3 | ||||
| -rw-r--r-- | app/views/networks/index.html.erb~ | 17 | ||||
| -rw-r--r-- | app/views/networks/new.html.erb~ | 3 | ||||
| -rw-r--r-- | app/views/networks/show.html.erb~ | 47 | ||||
| -rw-r--r-- | app/views/welcome/index.html.erb~ | 0 | ||||
| -rw-r--r-- | config/database.yml~ | 20 | ||||
| -rw-r--r-- | config/initializers/ninoxe.rb~ | 5 | ||||
| -rw-r--r-- | config/routes.rb~ | 58 |
16 files changed, 3 insertions, 294 deletions
@@ -55,7 +55,8 @@ gem 'will_paginate', '~> 3.0' gem 'ransack' gem 'squeel' -gem 'chouette-ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe' +# gem 'chouette-ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe' +gem 'chouette-ninoxe', :path => '~/workspace/chouette/ninoxe' group :development do gem 'autotest-rails' diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e1d3be438..b290ca2a8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,9 +33,9 @@ <li><%= tab_link_to Referential, referentials_path %></li> <% else %> <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li> - <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li> <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li> <li><%= tab_link_to t('activerecord.models.company'), referential_companies_path(@referential) %></li> + <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li> <li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li> <% end %> </ul> diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ deleted file mode 100644 index 183dd3b57..000000000 --- a/app/views/layouts/application.html.erb~ +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>Kyriel - <%= title %></title> - <%= stylesheet_link_tag :application %> - <%= javascript_include_tag :application %> - <%= csrf_meta_tag %> - <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - </head> - <body> - <div id="header"> - <div class="infos"> - </div> - - <div class="tabs"> - <ul class="main"> - - </ul> - </div> - </div> - <div id="body"> - <div id="flash"> - <% flash.each_pair do |type, message| %> - <%= content_tag :div, message, :class => type %> - <% end %> - </div> - <div id="workspace" class="<%= controller_name %> <%= action_name %>"> - <%= yield %> - </div> - <div id="sidebar"> - <%= yield :sidebar %> - </div> - </div> - </body> -</html> diff --git a/app/views/lines/_form.erb~ b/app/views/lines/_form.erb~ deleted file mode 100644 index b4c702187..000000000 --- a/app/views/lines/_form.erb~ +++ /dev/null @@ -1,13 +0,0 @@ -<% semantic_form_for [@network, @line] do |form| %> - <% form.inputs do %> - <%= form.input :name %> - <%= form.input :code %> - <%= form.input :priority, :as => :select, :collection => Potimart::Line.priorities %> - <%= form.input :color, :input_html => {:onclick => "startColorPicker(this)", :onkeyup => "maskedHex(this)"}%> - <% end %> - - <% form.buttons do %> - <%= form.commit_button %> - ou <%= link_to "revenir", [@network, @line] %> - <% end %> -<% end %> diff --git a/app/views/lines/_line.erb~ b/app/views/lines/_line.erb~ deleted file mode 100644 index 82873971a..000000000 --- a/app/views/lines/_line.erb~ +++ /dev/null @@ -1,16 +0,0 @@ -<% div_for(line) do %> - <% link_to(line, :class => "preview") do %> - <div class="color" style="background-color: <%= line.color or 'grey' %>"><div class="code"><%= line.code%></div></div> - <% end %> - <%= link_to line.name, line %> - <div class="info"> - <% if !line.journey_patterns.main.nil? %> - <p> - <%= line.journey_patterns.main.departure %> - <%= line.journey_patterns.main.arrival %> - </p> - <% end %> - <p> - <%= line.journey_patterns.count %> missions - </p> - </div> -<% end %> diff --git a/app/views/lines/show.html.erb~ b/app/views/lines/show.html.erb~ deleted file mode 100644 index fe9ddaca6..000000000 --- a/app/views/lines/show.html.erb~ +++ /dev/null @@ -1,45 +0,0 @@ -<%= title_tag "Ligne #{@line.name}" %> - -<div class="line_show"> - <%= @map.to_html %> - - <div class="summary"> - <p> - <label>Nom :</label> - <%= @line.name %> - </p> - <p> - <label>Code :</label> - <%= @line.code %> - </p> - <p> - <label>Priorité :</label> - <%= @line.priority %> - </p - <p> - <label>Couleur :</label> - <span style="background-color: <%= @line.color %>"> - <%= @line.color %> - </span> - </p> - <p> - <label>Identifiant Chouette :</label> - <%= @line.chouette_id %> - </p> - </div> - <div class="journey_patterns"> - <h3>Missions</h3> - <%= render :partial => "journey_patterns/journey_pattern", :collection => @line.journey_patterns %> - </div> -</div> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('lines.actions.edit'), edit_network_line_path(@network, @line), :class => "edit" %></li> - <li><%= link_to t('lines.actions.destroy'), network_line_path(@network, @line), :method => :delete, :confirm => "Etes vous sûr de supprimer la ligne #{@line.name} ?", :class => "remove" %></li> - <li><%= link_to "Ajouter un Arrêt", new_network_line_line_stop_point_path(@network, @line), :class => "add" %></li> - <br> - <li><%= link_to "Export CSV", network_line_path(@network, @line, :format => :csv), :class => "csv" %></li> - <li><%= link_to "Export KML", network_line_path(@network, @line, :format => :kml), :class => "kml" %></li> -</ul> -<% end %> diff --git a/app/views/networks/_form.erb~ b/app/views/networks/_form.erb~ deleted file mode 100644 index 19a3b8b84..000000000 --- a/app/views/networks/_form.erb~ +++ /dev/null @@ -1,18 +0,0 @@ -<%= 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 %> - <li><%= t('or') %></li> - <li><%= link_to t('back'), :back %></li> - <% end %> -<% end %> diff --git a/app/views/networks/_line.erb~ b/app/views/networks/_line.erb~ deleted file mode 100644 index f594c7f9d..000000000 --- a/app/views/networks/_line.erb~ +++ /dev/null @@ -1,11 +0,0 @@ -<%= div_for(line) do %> - <%= link_to([@referential, line], :class => "preview") do %> - <div class="color" style="background-color: grey "> - <div class="number"><%= line.number %></div> - </div> - <% end %> - <%= link_to line.name, [@referential, line] %> - <div class="info"> - - </div> -<% end %> diff --git a/app/views/networks/edit.html.erb~ b/app/views/networks/edit.html.erb~ deleted file mode 100644 index 491a821fa..000000000 --- a/app/views/networks/edit.html.erb~ +++ /dev/null @@ -1,3 +0,0 @@ -<%= 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~ deleted file mode 100644 index 03f5331e0..000000000 --- a/app/views/networks/index.html.erb~ +++ /dev/null @@ -1,17 +0,0 @@ -<div class="order"> - Trier par - <%= link_to_order "Code", "code" %> | - <%= link_to_order "Priorité", "priority" %> | - <%= link_to_order "Nom", "name" %> -</div> - -<%= title_tag Chouette::Line.model_name.human.pluralize %> - -<%= render :partial => "line", :collection => @lines %> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li> - <br> -</ul> -<% end %> diff --git a/app/views/networks/new.html.erb~ b/app/views/networks/new.html.erb~ deleted file mode 100644 index d580a2aae..000000000 --- a/app/views/networks/new.html.erb~ +++ /dev/null @@ -1,3 +0,0 @@ -<%= title_tag "Créer la Ligne" %> - -<%= render "form" %> diff --git a/app/views/networks/show.html.erb~ b/app/views/networks/show.html.erb~ deleted file mode 100644 index f0d987d3f..000000000 --- a/app/views/networks/show.html.erb~ +++ /dev/null @@ -1,47 +0,0 @@ -<%= title_tag @line.name %> - -<div class="line_show"> - - <div class="summary"> - <p> - <label><%= Chouette::Line.human_attribute_name(:network) %>: </label> - <%= @line.network.name if @line.network.present? %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("company") %>: </label> - <%= @line.company.name if @line.company.present? %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("registrationnumber") %>: </label> - <%= @line.registrationnumber %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("name") %>: </label> - <%= @line.name %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("publishedname") %>: </label> - <%= @line.publishedname %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("number") %>: </label> - <%= @line.number %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("transportmodename") %>: </label> - <%= @line.transportmodename %> - </p> - <p> - <label><%= Chouette::Line.human_attribute_name("comment") %>: </label> - <%= @line.comment %> - </p> - </div> -</div> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('lines.actions.edit'), edit_referential_line_path(@referential, @line), :class => "edit" %></li> - <li><%= link_to t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :confirm => t('lines.actions.destroy_confirm'), :class => "remove" %></li> - <br> -</ul> -<% end %> diff --git a/app/views/welcome/index.html.erb~ b/app/views/welcome/index.html.erb~ deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/welcome/index.html.erb~ +++ /dev/null diff --git a/config/database.yml~ b/config/database.yml~ deleted file mode 100644 index 175f3eb3d..000000000 --- a/config/database.yml~ +++ /dev/null @@ -1,20 +0,0 @@ -# SQLite version 3.x -# gem 'activerecord-jdbcsqlite3-adapter' -# -# Configure Using Gemfile -# gem 'activerecord-jdbcsqlite3-adapter' -# -development: - adapter: sqlite3 - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - -production: - adapter: sqlite3 - database: db/production.sqlite3 diff --git a/config/initializers/ninoxe.rb~ b/config/initializers/ninoxe.rb~ deleted file mode 100644 index 72136a660..000000000 --- a/config/initializers/ninoxe.rb~ +++ /dev/null @@ -1,5 +0,0 @@ -class Chouette::Line - def self.model_name - AciveModel::Name.new("Line") - end -end diff --git a/config/routes.rb~ b/config/routes.rb~ deleted file mode 100644 index e1d4c59c7..000000000 --- a/config/routes.rb~ +++ /dev/null @@ -1,58 +0,0 @@ -ChouetteIhm::Application.routes.draw do - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end |