diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/stop_areas.css.scss | 6 | ||||
| -rw-r--r-- | app/views/companies/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/lines/index.html.erb | 15 | ||||
| -rw-r--r-- | app/views/stop_areas/_form.html.erb | 6 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.erb | 2 |
5 files changed, 19 insertions, 12 deletions
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss index b751723b4..e66f4dd28 100644 --- a/app/assets/stylesheets/stop_areas.css.scss +++ b/app/assets/stylesheets/stop_areas.css.scss @@ -65,6 +65,12 @@ span { margin-left: 7px; } img { margin: 0px 5px 0px 5px;} } + .no_parent{ + float: left; + padding: 3px 15px 3px 3px; + height: 25px; + width: 150px; + } .target{ border: 2px solid #86b41d; diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb index 8703bbc49..b5c64b691 100644 --- a/app/views/companies/show.html.erb +++ b/app/views/companies/show.html.erb @@ -57,7 +57,7 @@ <% content_for :sidebar do %> <ul class="actions"> <li><%= link_to t('companies.actions.edit'), edit_referential_company_path(@referential, @company), :class => "edit" %></li> - <li><%= link_to t('companys.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li> <br> </ul> <% end %> diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb index 26b97e0b3..f499f6940 100644 --- a/app/views/lines/index.html.erb +++ b/app/views/lines/index.html.erb @@ -23,7 +23,6 @@ </p> <% end %> - <div class="pagination"> <div class="page_info"> <%= page_entries_info @lines %> @@ -63,21 +62,21 @@ </ul> <div id="multiple_selection_menu"> - <h3>Sélection multiple</h3> + <h3><%= t(".multi_selection") %> </h3> <div class="disabled"> - <a class="enable" href="#">Activer la sélection multiple</a> + <a class="enable" href="#"><%= t(".multi_selection_enable") %></a> </div> <div class="enabled" style="display: none;"> - <a class="disable" href="#">Désactiver la sélection multiple</a> + <a class="disable" href="#"><%= t(".multi_selection_disable") %></a> <ul class="actions"> - <li><a href="#" class="remove">Supprimer les lignes</a></li> - <li><a href="#" class="export">Exporter les lignes</a></li> + <li><a href="#" class="remove"><%= t(".delete_selected") %></a></li> + <li><a href="#" class="export"><%= t(".export_selected") %></a></li> </ul> - <a class="select_all" href="#">Tout sélectionner</a> | <a class="deselect_all" href="#">désélectionner</a> - </div> + <a class="select_all" href="#"><%= t(".select_all") %></a> | <a class="deselect_all" href="#"><%= t(".deselect_all") %></a> + </div> </div> <% end %> diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb index ffdd9faa1..208345523 100644 --- a/app/views/stop_areas/_form.html.erb +++ b/app/views/stop_areas/_form.html.erb @@ -12,11 +12,11 @@ <%= form.input :objectid %> <% else %> <li> - <label><%= @stop_area.human_attribute_name("stop_area_type") %>: </label> - <%= @stop_area.stop_area_type %> + <label><%= @stop_area.human_attribute_name("stop_area_type") %></label> + <%= t("area_types.label.#{@stop_area.stop_area_type}") %> </li> <li> - <label><%= @stop_area.human_attribute_name("objectid") %>: </label> + <label><%= @stop_area.human_attribute_name("objectid") %></label> <%= @stop_area.objectid %> </li> <% end %> diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb index f4f7a9064..afaa5830a 100644 --- a/app/views/stop_areas/show.html.erb +++ b/app/views/stop_areas/show.html.erb @@ -96,6 +96,8 @@ <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, @stop_area.parent), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %> </div> <div class="link"><%= image_tag "icons/link.png"%></div> + <% else %> + <div class="no_parent"> </div> <% end %> <% if @stop_area.parent.present? || @stop_area.children.present? %> |