diff options
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.erb | 4 | ||||
| -rw-r--r-- | config/locales/lines.yml | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c889cdef0..47e385c2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: c572eb23f0c9ec2d8857f453935f90986e170870 + revision: 6d20a3e203107767bc8ca85ba268e7279de8407e specs: ninoxe (0.0.8) GeoRuby @@ -85,6 +85,7 @@ GEM activesupport (= 3.1.3) activesupport (3.1.3) multi_json (~> 1.0) + acts_as_list (0.1.6) addressable (2.2.8) arel (2.2.3) bcrypt-ruby (3.0.1) @@ -108,6 +109,7 @@ GEM xpath (~> 0.1.4) childprocess (0.3.2) ffi (~> 1.0.6) + cocoon (1.0.20) coffee-rails (3.1.1) coffee-script (>= 2.2.0) railties (~> 3.1.0) @@ -158,7 +160,6 @@ GEM jruby-openssl (0.7.6.1) bouncy-castle-java (>= 1.5.0146.1) jruby-rack (1.1.5) - json (1.7.0) json (1.7.0-java) launchy (2.1.0) addressable (~> 2.2.6) @@ -297,12 +298,14 @@ DEPENDENCIES SyslogLogger activerecord-jdbcpostgresql-adapter! activerecord-jdbcsqlite3-adapter + acts_as_list acts_as_tree! apartment! capistrano capistrano-ext capybara capybara-webkit + cocoon coffee-rails (~> 3.1.1) coffee-script-source database_cleaner diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb index 905d0bb43..0f41b3578 100644 --- a/app/views/stop_areas/show.html.erb +++ b/app/views/stop_areas/show.html.erb @@ -125,10 +125,10 @@ <ul class="actions"> <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li> <li><%= link_to t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %></li> - <% if @stop_area.type != 'itl' %> + <% if @stop_area.stop_area_type != 'itl' %> <li><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "select_parent" %></li> <% end %> - <% if @stop_area.type != 'boarding_position' && @stop_area.type != 'quay' %> + <% if @stop_area.stop_area_type != 'boarding_position' && @stop_area.stop_area_type != 'quay' %> <li><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "add_children" %></li> <% end %> <br> diff --git a/config/locales/lines.yml b/config/locales/lines.yml index 7e565f24b..a2ba7df95 100644 --- a/config/locales/lines.yml +++ b/config/locales/lines.yml @@ -24,7 +24,7 @@ en: line: network: Network company: Company - registrationnumber: Registration number + registration_number: Registration number name: Name published_name: Published name number: Number @@ -37,7 +37,7 @@ en: formtastic: hints: line: - registrationnumber: only alphanumerical or underscore characters + registration_number: only alphanumerical or underscore characters objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" fr: @@ -66,7 +66,7 @@ fr: line: network: Réseau company: Transporteur - registrationnumber: "Numéro d'enregistrement" + registration_number: "Numéro d'enregistrement" name: Nom published_name: Nom public number: Indice @@ -79,6 +79,6 @@ fr: formtastic: hints: line: - registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" + registration_number: "caractères autorisés : alphanumériques et 'souligné'" objectid: "[prefixe]:Line:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" |