diff options
| -rw-r--r-- | Gemfile.lock | 22 | ||||
| -rw-r--r-- | app/views/stop_areas/_form.html.erb | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4a3fa4848..4647bac17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: df65dcd8b9d50cecf4e90b7ff1b0261cd37bd951 + revision: d17ef0bdb77f7817bcaa923e4d3dc32e3a44a0bd specs: chouette-ninoxe (0.0.8) GeoRuby @@ -91,6 +91,8 @@ GEM activesupport (3.1.3) multi_json (~> 1.0) addressable (2.2.6) + albino (1.3.3) + posix-spawn (>= 0.3.6) arel (2.2.3) autotest-notification (2.3.4) autotest-standalone (~> 4.5) @@ -116,6 +118,8 @@ GEM xpath (~> 0.1.4) childprocess (0.3.0) ffi (~> 1.0.6) + classifier (1.3.3) + fast-stemmer (>= 1.0.0) coffee-rails (3.1.1) coffee-script (>= 2.2.0) railties (~> 3.1.0) @@ -137,6 +141,7 @@ GEM nokogiri (>= 1.5.0) database_cleaner (0.7.1) diff-lcs (1.1.3) + directory_watcher (1.4.1) erubis (2.7.0) execjs (1.2.13) multi_json (~> 1.0) @@ -145,6 +150,7 @@ GEM factory_girl_rails (1.6.0) factory_girl (~> 2.5.0) railties (>= 3.0.0) + fast-stemmer (1.0.0) ffi (1.0.11) ffi (1.0.11-java) formtastic (2.0.2) @@ -169,6 +175,13 @@ GEM inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) + jekyll (0.11.2) + albino (~> 1.3) + classifier (~> 1.3) + directory_watcher (~> 1.1) + kramdown (~> 0.13) + liquid (~> 2.3) + maruku (~> 0.5) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) @@ -178,17 +191,21 @@ GEM jruby-rack (1.1.2) json (1.6.5) json (1.6.5-java) + kramdown (0.13.5) launchy (2.0.5) addressable (~> 2.2.6) launchy (2.0.5-java) addressable (~> 2.2.6) ffi (~> 1.0.9) spoon (~> 0.0.1) + liquid (2.3.0) mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) map_layers (0.0.5) + maruku (0.6.0) + syntax (>= 1.0.0) mime-types (1.18) multi_json (1.0.4) net-scp (1.0.4) @@ -204,6 +221,7 @@ GEM polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) + posix-spawn (0.3.6) rack (1.3.6) rack-cache (1.2) rack (>= 0.4) @@ -283,6 +301,7 @@ GEM activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) + syntax (1.0.0) term-ansicolor (1.0.7) therubyrhino (1.73.1) thor (0.14.6) @@ -331,6 +350,7 @@ DEPENDENCIES guard guard-rspec inherited_resources + jekyll jquery-rails jruby-openssl json diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index 7008b8292..dc953f5e0 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -7,7 +7,7 @@ <%= form.input :country_code %> <%= form.input :fare_code %> <%= form.input :registration_number %> - <%= form.input :type, :as => :select, :collection => Chouette::StopArea.types, :include_blank => false, :member_label => Proc.new { |mode| t("area_types.label.#{mode}") } %> + <%= form.input :area_type, :as => :select, :collection => Chouette::StopArea.types, :include_blank => false, :member_label => Proc.new { |type| t("area_types.label.#{type}") } %> <% if @stop_area.new_record? %> <%= form.input :objectid %> <% else %> |