diff options
| author | Marc Florisson | 2012-06-01 12:20:57 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-06-01 12:20:57 +0200 |
| commit | ee866a45955bac5cef7a8bdec58f86ffcb7cb702 (patch) | |
| tree | e66d3da0e628034afc362b524b52a1a71977f4ff /app/views/lines | |
| parent | 7fd20ad1409398e06fb1167332c57b4ac4c9aadc (diff) | |
| parent | 7082d66ec221aee194d64a17ab5d21eb2955f419 (diff) | |
| download | chouette-core-ee866a45955bac5cef7a8bdec58f86ffcb7cb702.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'app/views/lines')
| -rw-r--r-- | app/views/lines/_line.erb | 4 | ||||
| -rw-r--r-- | app/views/lines/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/lines/show.html.erb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb index 5405bcbb5..3565966fb 100644 --- a/app/views/lines/_line.erb +++ b/app/views/lines/_line.erb @@ -2,11 +2,11 @@ <%= link_to([@referential, line], :class => "preview", :title => "Ligne #{line.number}") do %> <div class="color"> <% if line.number and line.number.length <= 3 %> - <div class="number"><%= line.number %></div> + <div class="number"><%= line.number %></div> <% end %> - <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %> </div> <% end %> + <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %> <%= link_to truncate(line.name, :length => 30), [@referential, line], :title => "Ligne #{line.name}" %> <div class="info"> <%= line.human_attribute_name('network') %> <%= link_to_if line.network, line.network.name, referential_network_path(@referential, line.network), :title => "#{line.human_attribute_name('network')} #{line.network.name}" %> - diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb index c39e94cbd..8c9766866 100644 --- a/app/views/lines/index.html.erb +++ b/app/views/lines/index.html.erb @@ -75,7 +75,7 @@ <a class="disable" href="#"><%= t(".multi_selection_disable") %></a> <ul class="actions"> - <li><a href="#" class="remove"><%= t(".delete_selected") %></a></li> + <%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %> <li><a href="#" class="export"><%= t(".export_selected") %></a></li> </ul> diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb index 8d6157cc7..5e210ff5e 100644 --- a/app/views/lines/show.html.erb +++ b/app/views/lines/show.html.erb @@ -1,7 +1,7 @@ <%= title_tag t('lines.show.title', :line => @line.name ) %> <div class="line_show"> - <%= @map.to_html.html_safe %> + <%= @map.to_html %> <div class="summary"> <p> |