From 61cd44aa68fe296675b1a4863c71cdcfb38257ff Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 19 Apr 2012 08:42:36 +0200
Subject: update help and put an empty all icon on area types
---
app/assets/images/map/all.png | Bin 0 -> 1231 bytes
app/assets/stylesheets/help.css.scss | 70 +++++++++++++++++++++++++++++++++
app/controllers/help_controller.rb | 1 +
app/views/help/dataspaces.textile | 2 +-
app/views/help/index.textile | 30 +++++---------
app/views/help/show.html.erb | 6 +++
app/views/help/stop_areas.textile | 2 +-
app/views/help/toc.textile | 26 ++++++++++++
app/views/layouts/application.html.erb | 2 +-
app/views/stop_areas/index.html.erb | 2 +-
10 files changed, 117 insertions(+), 24 deletions(-)
create mode 100644 app/assets/images/map/all.png
create mode 100644 app/views/help/toc.textile
diff --git a/app/assets/images/map/all.png b/app/assets/images/map/all.png
new file mode 100644
index 000000000..a638e013f
Binary files /dev/null and b/app/assets/images/map/all.png differ
diff --git a/app/assets/stylesheets/help.css.scss b/app/assets/stylesheets/help.css.scss
index ca68e15b5..4952b18e1 100644
--- a/app/assets/stylesheets/help.css.scss
+++ b/app/assets/stylesheets/help.css.scss
@@ -68,3 +68,73 @@ dd {
padding-left: 10px;
}
}
+#sidebarhelp.help {
+h2 {
+ font-size: 17px;
+}
+
+h3 {
+ font-size: 15px;
+}
+
+h4 {
+ font-weight: bold;
+ padding: 7px 0;
+}
+
+ul li {
+ list-style: circle;
+ margin: 7px 0 7px 20px;
+}
+
+ol {
+ list-style: none;
+ margin: 7px 0 7px 20px;
+ padding: 0;
+ counter-reset: num;
+}
+
+ol li:before {
+ content: counter(num) '. ';
+ counter-increment: num;
+}
+
+ol ol li:before {
+ content: counters(num, '.') ' ';
+}
+
+em {
+ font-style: italic;
+}
+
+strong {
+ font-weight: bold;
+}
+
+cite {
+ font-style: italic;
+}
+
+p.attr_data {
+ font-style: italic;
+ text-decoration: underline;
+}
+
+table {
+ width: 100%;
+}
+
+table td {
+ padding: 3px 5px;
+ width: 30%;
+}
+
+dt {
+ font-style:italic;
+ margin: 5px 0;
+}
+
+dd {
+ padding-left: 10px;
+}
+}
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 92f96ebd7..91e8088de 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -2,6 +2,7 @@ class HelpController < ApplicationController
def show
@page = HelpPage.find(slug)
+ @toc = HelpPage.find("toc")
end
private
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 @@
<%= @page.title %>
<%= textilize(@page.content).html_safe %>
+
+<% content_for :sidebar do %>
+
+<% 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 @@
- Chouette - <%= title %>
+ Chouette V2 - <%= title %>
<%= stylesheet_link_tag :application %>
<%= javascript_include_tag :application %>
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| %>
<%= link_with_search (image_tag("map/" + area_type.name.downcase + ".png")+t("area_types.label.#{area_type.to_s}")), "areatype_eq" => area_type.name %>
<% end %>
-<%= link_with_search t(".selection_all"), {"areatype_eq" => nil}, :class => "all" %>
+<%= link_with_search (image_tag("map/all.png")+t(".selection_all")), {"areatype_eq" => nil}, :class => "all" %>
<% end %>
--
cgit v1.2.3