aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/stop_areas
diff options
context:
space:
mode:
authorMarc Florisson2014-09-29 18:19:56 +0200
committerMarc Florisson2014-09-29 18:19:56 +0200
commit033928c1a4858ec2473f0fbb92dbaa69a51033a5 (patch)
treef7ddbbe41c3b2e534960b6fd56876d1c53be5f15 /app/views/stop_areas
parent8822bc9101d2fc6081ccd0e27c77b57ebbbbbaba (diff)
parent2521ca8de5a57633c1e6c5a3dd2a94826bf535a0 (diff)
downloadchouette-core-033928c1a4858ec2473f0fbb92dbaa69a51033a5.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/views/stop_areas')
-rw-r--r--app/views/stop_areas/index.html.erb2
-rw-r--r--app/views/stop_areas/show.html.erb12
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/stop_areas/index.html.erb b/app/views/stop_areas/index.html.erb
index 915e4523a..93406dc81 100644
--- a/app/views/stop_areas/index.html.erb
+++ b/app/views/stop_areas/index.html.erb
@@ -32,7 +32,7 @@
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), :class => "add" %></li>
- <li><%= link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator_edit" %></li>
+ <li><%= link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator" %></li>
</ul>
<% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index f9838f91b..3a6d88207 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -127,13 +127,13 @@
<tr><td>
<h4><%= t(".stop_managment") %></h4>
<ul class="actions">
- <li><font color="#D98F3B"><i class="fa fa-arrow-up fa-fw"></i></font><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "with_fa" %></li>
+ <li><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "parent" %></li>
<% if @stop_area.parent == nil %>
- <li><font color="green"><i class="fa fa-files-o fa-fw"></i></font><%= link_to t('stop_areas.actions.clone_as_parent'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "parent"), :class => "with_fa" %></li>
+ <li><%= link_to t('stop_areas.actions.clone_as_parent'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "parent"), :class => "clone" %></li>
<% end %>
<% if manage_children %>
- <li><font color="#D98F3B"><i class="fa fa-sitemap fa-fw"></i></font><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "with_fa" %></li>
- <li><font color="green"><i class="fa fa-files-o fa-fw"></i></font><%= link_to t('stop_areas.actions.clone_as_child'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "child"), :class => "with_fa" %></li>
+ <li></i></font><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "children" %></li>
+ <li><%= link_to t('stop_areas.actions.clone_as_child'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "child"), :class => "clone" %></li>
<% end %>
</ul>
</td></tr>
@@ -142,8 +142,8 @@
<tr><td>
<h4><%= t(".access_managment") %></h4>
<ul class="actions">
- <li><font color="green"><i class="fa fa-plus-circle"></i></font><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "with_fa" %></li>
- <li><font color="#D98F3B"><i class="fa fa-arrows-alt fa-fw"></i></font><%= link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), :class => "with_fa" %></li>
+ <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
+ <li><%= link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), :class => "access_link" %></li>
</ul>
</td></tr>
<% end %>