diff options
| author | Michel Etienne | 2012-04-17 11:52:43 +0200 | 
|---|---|---|
| committer | Michel Etienne | 2012-04-17 11:52:43 +0200 | 
| commit | c31941d2969b7e17c136c3dcea41d4fc92a8a874 (patch) | |
| tree | d40ca23907841638777c8201d11ac99c2797fee7 | |
| parent | c98146353f42342155b05cff2c4daeedd1621b52 (diff) | |
| download | chouette-core-c31941d2969b7e17c136c3dcea41d4fc92a8a874.tar.bz2 | |
stop icons in help and stoptype filter
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | app/assets/images/map/itl.png | bin | 0 -> 1294 bytes | |||
| -rw-r--r-- | app/views/help/stop_areas.textile | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/index.html.erb | 2 | ||||
| -rw-r--r-- | public/help/boardingposition.png (renamed from doc/functional/boardingposition.png) | bin | 3440 -> 3440 bytes | |||
| -rw-r--r-- | public/help/commercialstoppoint.png (renamed from doc/functional/commercialstoppoint.png) | bin | 3561 -> 3561 bytes | |||
| -rw-r--r-- | public/help/itl.png | bin | 0 -> 1294 bytes | |||
| -rw-r--r-- | public/help/quay.png (renamed from doc/functional/quay.png) | bin | 3407 -> 3407 bytes | |||
| -rw-r--r-- | public/help/stopplace.png (renamed from doc/functional/stopplace.png) | bin | 3809 -> 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.pngBinary files differ new file mode 100644 index 000000000..a7ef80773 --- /dev/null +++ b/app/assets/images/map/itl.png 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.pngBinary files differ index f3ffe75d9..f3ffe75d9 100644 --- a/doc/functional/boardingposition.png +++ b/public/help/boardingposition.png diff --git a/doc/functional/commercialstoppoint.png b/public/help/commercialstoppoint.pngBinary files differ index 2c87dc31a..2c87dc31a 100644 --- a/doc/functional/commercialstoppoint.png +++ b/public/help/commercialstoppoint.png diff --git a/public/help/itl.png b/public/help/itl.pngBinary files differ new file mode 100644 index 000000000..a7ef80773 --- /dev/null +++ b/public/help/itl.png diff --git a/doc/functional/quay.png b/public/help/quay.pngBinary files differ index a2bd8e954..a2bd8e954 100644 --- a/doc/functional/quay.png +++ b/public/help/quay.png diff --git a/doc/functional/stopplace.png b/public/help/stopplace.pngBinary files differ index b5058573e..b5058573e 100644 --- a/doc/functional/stopplace.png +++ b/public/help/stopplace.png | 
