diff options
| author | Michel Etienne | 2012-04-19 08:42:36 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-04-19 08:42:36 +0200 |
| commit | 61cd44aa68fe296675b1a4863c71cdcfb38257ff (patch) | |
| tree | 92494cd7f07c5223cc477e78d07c990c3f0e0a04 /app/views | |
| parent | 0671126a7169ebc6b77576703a26cd47957476c6 (diff) | |
| download | chouette-core-61cd44aa68fe296675b1a4863c71cdcfb38257ff.tar.bz2 | |
update help and put an empty all icon on area types
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/help/dataspaces.textile | 2 | ||||
| -rw-r--r-- | app/views/help/index.textile | 30 | ||||
| -rw-r--r-- | app/views/help/show.html.erb | 6 | ||||
| -rw-r--r-- | app/views/help/stop_areas.textile | 2 | ||||
| -rw-r--r-- | app/views/help/toc.textile | 26 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/index.html.erb | 2 |
7 files changed, 46 insertions, 24 deletions
diff --git a/app/views/help/dataspaces.textile b/app/views/help/dataspaces.textile index 536ea4173..68e88173b 100644 --- a/app/views/help/dataspaces.textile +++ b/app/views/help/dataspaces.textile @@ -1,6 +1,6 @@ --- layout: default -title: Espaces de donnees +title: Espaces de données --- h3. Définition diff --git a/app/views/help/index.textile b/app/views/help/index.textile index 64a4281e5..c3b5ee2bd 100644 --- a/app/views/help/index.textile +++ b/app/views/help/index.textile @@ -8,30 +8,20 @@ Chouette v2 : itération 4 du 16/04/2012 Cette itération présente les formulaires de : * réseaux +* transporteurs * lignes * arrêts * calendriers d'application -l'avancement actuel permet de ... +l'avancement actuel permet de : -h3. Sommaire +* créer, modifier et supprimer les objets +* consulter les cartes -# "Généralités":introduction -## "Normalisation":normalisation -# "Espaces de données":dataspaces -# "Réseaux":networks -# "Transporteurs":companies -# "Lignes":lines -## Séquences d'arrêts -## Horaires -# "Arrêts":stop_areas -## Correspondances -## Accès -## Liaisons Arrêt-Accès -# "Calendriers d'application":timetables -# Outils -## Imports -## Validation -# Divers -## "API Rest":restapis +les action suivantes ne sont pas encore disponible : +* déplacer un arrêt depuis la carte +* afficher le fond Géoportail +* ajouter ou supprimer des dates et des périodes aux calendriers +* associer les arrêts à leurs parents +* associer une ITL à une ligne diff --git a/app/views/help/show.html.erb b/app/views/help/show.html.erb index b5c8506ee..cd4c595eb 100644 --- a/app/views/help/show.html.erb +++ b/app/views/help/show.html.erb @@ -1,3 +1,9 @@ <h2><%= @page.title %></h2> <%= textilize(@page.content).html_safe %> + +<% content_for :sidebar do %> +<div id="sidebarhelp" class="help"> +<%= textilize(@toc.content).html_safe %> +</div> +<% end %>
\ No newline at end of file diff --git a/app/views/help/stop_areas.textile b/app/views/help/stop_areas.textile index a562e21cb..8c468e9f1 100644 --- a/app/views/help/stop_areas.textile +++ b/app/views/help/stop_areas.textile @@ -1,6 +1,6 @@ --- layout: default -title: Arrêts +title: Arrêts --- h3. Définition diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile new file mode 100644 index 000000000..f4f6998f8 --- /dev/null +++ b/app/views/help/toc.textile @@ -0,0 +1,26 @@ +--- +layout: default +title: sommaire +--- + +h3. Sommaire + +# "Généralités":introduction +## "Normalisation":normalisation +# "Espaces de données":dataspaces +# "Réseaux":networks +# "Transporteurs":companies +# "Lignes":lines +## Séquences d'arrêts +## Horaires +# "Arrêts":stop_areas +## Correspondances +## Accès +## Liaisons Arrêt-Accès +# "Calendriers d'application":timetables +# Outils +## Imports +## Validation +# Divers +## "API Rest":restapis + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f75b138fe..9c48ff00b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>Chouette - <%= title %></title> + <title>Chouette V2 - <%= title %></title> <%= stylesheet_link_tag :application %> <%= javascript_include_tag :application %> <script src="http://maps.google.com/maps/api/js?v=3.2&sensor=false"></script> diff --git a/app/views/stop_areas/index.html.erb b/app/views/stop_areas/index.html.erb index 873b4fb2e..d9587f36b 100644 --- a/app/views/stop_areas/index.html.erb +++ b/app/views/stop_areas/index.html.erb @@ -27,7 +27,7 @@ <% Chouette::StopArea.types.each do |area_type| %> <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> +<li><%= link_with_search (image_tag("map/all.png")+t(".selection_all")), {"areatype_eq" => nil}, :class => "all" %></li> </ul> <% end %> |