aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-04-17 11:52:43 +0200
committerMichel Etienne2012-04-17 11:52:43 +0200
commitc31941d2969b7e17c136c3dcea41d4fc92a8a874 (patch)
treed40ca23907841638777c8201d11ac99c2797fee7
parentc98146353f42342155b05cff2c4daeedd1621b52 (diff)
downloadchouette-core-c31941d2969b7e17c136c3dcea41d4fc92a8a874.tar.bz2
stop icons in help and stoptype filter
-rw-r--r--.gitignore2
-rw-r--r--app/assets/images/map/itl.pngbin0 -> 1294 bytes
-rw-r--r--app/views/help/stop_areas.textile2
-rw-r--r--app/views/stop_areas/index.html.erb2
-rw-r--r--public/help/boardingposition.png (renamed from doc/functional/boardingposition.png)bin3440 -> 3440 bytes
-rw-r--r--public/help/commercialstoppoint.png (renamed from doc/functional/commercialstoppoint.png)bin3561 -> 3561 bytes
-rw-r--r--public/help/itl.pngbin0 -> 1294 bytes
-rw-r--r--public/help/quay.png (renamed from doc/functional/quay.png)bin3407 -> 3407 bytes
-rw-r--r--public/help/stopplace.png (renamed from doc/functional/stopplace.png)bin3809 -> 3809 bytes
9 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 65620c008..aa1e11631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@
/tmp
*~
public/assets/
-public/help/*
+
diff --git a/app/assets/images/map/itl.png b/app/assets/images/map/itl.png
new file mode 100644
index 000000000..a7ef80773
--- /dev/null
+++ b/app/assets/images/map/itl.png
Binary files differ
diff --git a/app/views/help/stop_areas.textile b/app/views/help/stop_areas.textile
index f527798fe..a562e21cb 100644
--- a/app/views/help/stop_areas.textile
+++ b/app/views/help/stop_areas.textile
@@ -41,6 +41,8 @@ h3. Attributs
* !quay.png! quai
* !commercialstoppoint.png! arrêt commercial
* !stopplace.png! pôle d'échange
+* !itl.png! ITL
+
- Nom := nom de l'arrêt
- Commentaire := zone de texte libre
diff --git a/app/views/stop_areas/index.html.erb b/app/views/stop_areas/index.html.erb
index 67d46b99e..873b4fb2e 100644
--- a/app/views/stop_areas/index.html.erb
+++ b/app/views/stop_areas/index.html.erb
@@ -25,7 +25,7 @@
<ul class="selection">
<% Chouette::StopArea.types.each do |area_type| %>
-<li><%= link_with_search t("area_types.label.#{area_type.to_s}"), "areatype_eq" => area_type.name %></li>
+<li><%= link_with_search (image_tag("map/" + area_type.name.downcase + ".png")+t("area_types.label.#{area_type.to_s}")), "areatype_eq" => area_type.name %></li>
<% end %>
<li><%= link_with_search t(".selection_all"), {"areatype_eq" => nil}, :class => "all" %></li>
</ul>
diff --git a/doc/functional/boardingposition.png b/public/help/boardingposition.png
index f3ffe75d9..f3ffe75d9 100644
--- a/doc/functional/boardingposition.png
+++ b/public/help/boardingposition.png
Binary files differ
diff --git a/doc/functional/commercialstoppoint.png b/public/help/commercialstoppoint.png
index 2c87dc31a..2c87dc31a 100644
--- a/doc/functional/commercialstoppoint.png
+++ b/public/help/commercialstoppoint.png
Binary files differ
diff --git a/public/help/itl.png b/public/help/itl.png
new file mode 100644
index 000000000..a7ef80773
--- /dev/null
+++ b/public/help/itl.png
Binary files differ
diff --git a/doc/functional/quay.png b/public/help/quay.png
index a2bd8e954..a2bd8e954 100644
--- a/doc/functional/quay.png
+++ b/public/help/quay.png
Binary files differ
diff --git a/doc/functional/stopplace.png b/public/help/stopplace.png
index b5058573e..b5058573e 100644
--- a/doc/functional/stopplace.png
+++ b/public/help/stopplace.png
Binary files differ