aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/views/help/introduction.textile8
-rw-r--r--app/views/shared/_footer.erb4
-rw-r--r--config/environments/development.rb4
-rw-r--r--config/environments/production.rb30
-rw-r--r--config/environments/test.rb24
-rw-r--r--public/help/2014-10-30_172801.pngbin2405 -> 0 bytes
6 files changed, 35 insertions, 35 deletions
diff --git a/app/views/help/introduction.textile b/app/views/help/introduction.textile
index 525ef133c..544edd8aa 100644
--- a/app/views/help/introduction.textile
+++ b/app/views/help/introduction.textile
@@ -5,19 +5,19 @@ title: Présentation
CHOUETTE est un logiciel libre développé à l'initiative du ministère français chargé des transports (et du développement durable), dans le but de faciliter l'échange de données d'offre (théorique) de transport collectif (TC), en s'appuyant pour cela sur la norme NFP 99506, dite Neptune, qui spécifie un profil d'échange XML.
-!2014-10-30_172801.png!
+!version.png!
CHOUETTE est une application web. Elle permet de saisir, éditer, tester des données théoriques de transport public depuis un navigateur internet. Afin de faciliter la création de réseaux complets, elle est dotée de fonctions d'import, soit depuis d'autres formats d'applications équivalentes, soit au travers d'un fichier CSV qui permet de mener des imports massifs plutôt que de saisir tous les éléments un à un dans les formulaires adhoc.
h3. A qui s'adresse ce manuel ?
-Ce manuel s’adresse aux utilisateurs de CHOUETTE. Les utilisateurs visés sont les collectivités locales Autorités Organisatrices de Transport (AOT), les exploitants des réseaux TC et leurs prestataires (bureaux d'étude ou société de services).
+Ce manuel s’adresse aux utilisateurs de CHOUETTE. Les utilisateurs visés sont les collectivités locales Autorités Organisatrices de Transport (AOT), les exploitants des réseaux TC et leurs prestataires (bureaux d'étude ou société de services).
D'autres utilisateurs potentiels sont également identifiés : services de l'état, éditeurs de logiciels, opérateurs de services d'information, chercheurs...
h3. Ce que vous trouverez dans ce manuel
-Vous trouverez dans ce document, toutes les informations nécessaires à la prise en main de l’application.
-Le manuel couvre la version 2.5.2.
+Vous trouverez dans ce document, toutes les informations nécessaires à la prise en main de l’application.
+Le manuel couvre la version 3.0.0.
diff --git a/app/views/shared/_footer.erb b/app/views/shared/_footer.erb
index 9b21219a0..e8fe2d5e4 100644
--- a/app/views/shared/_footer.erb
+++ b/app/views/shared/_footer.erb
@@ -8,7 +8,7 @@
<li><h4><%= t("layouts.footer.product.title") %></h4></li>
<li><%= link_to t("layouts.footer.product.licence"), "http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.html", :target => "_blank" %></li>
<li><%= link_to t("layouts.footer.product.source_code"), "https://github.com/afimb/chouette2", :target => "_blank" %></li>
- <li><%= link_to t("layouts.footer.product.user_group"), "http://www.chouette.mobi/les-utilisateurs/club-utilisateur-des-outils-chouette-et-irys/", :target => "_blank" %></li>
+ <li><%= link_to t("layouts.footer.product.user_group"), "http://www.chouette.mobi/club-utilisateurs/", :target => "_blank" %></li>
</ul>
</div>
<div class="col-md-3">
@@ -34,7 +34,7 @@
<%= link_to t("layouts.footer.contact.mail"), "#{ChouetteIhm::Application.config.company_contact}", :target => "_blank" %>
<% end %>
</li>
- <li><%= link_to t("layouts.footer.contact.newsletter"),"http://www.chouette.mobi/les-utilisateurs/etre-informe/", :target => "_blank" %></li>
+ <li><%= link_to t("layouts.footer.contact.newsletter"),"http://www.chouette.mobi/club-utilisateurs/newsletter/", :target => "_blank" %></li>
<li><%= link_to t("layouts.footer.contact.forum"), "http://forum.chouette.mobi/", :target => "_blank" %></li>
</ul>
</div>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0cd0d21de..2d01ba666 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -54,7 +54,7 @@ Rails.application.configure do
# AFIMB
config.company_name = "afimb"
config.company_theme = "#61970b" # AFIMB color
- config.company_contact = "http://www.chouette.mobi/contact-support/"
+ config.company_contact = "http://www.chouette.mobi/club-utilisateurs/contact-support/"
config.accept_user_creation = true
# CITYWAY
@@ -67,7 +67,7 @@ Rails.application.configure do
config.demo_data = "tmp/demo.zip"
# link to validation specification pages
- config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
+ config.validation_spec = "http://www.chouette.mobi/neptune-validation/v21/"
config.i18n.available_locales = [:fr, :en]
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6c5b89685..767b28a93 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -2,7 +2,7 @@ Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
config.eager_load = true
-
+
# Code is not reloaded between requests.
config.cache_classes = true
@@ -48,7 +48,7 @@ Rails.application.configure do
# Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ]
-
+
# Use a different logger for distributed setups.
#if ENV['OS'] == 'Windows_NT'
# # args = log_path,number of files,file sizes
@@ -83,13 +83,13 @@ Rails.application.configure do
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
-
+
if ENV['CHOUETTE_BASE_URL'].nil?
config.action_mailer.default_url_options = { :host => 'my-domain-name.com' }
else
config.action_mailer.default_url_options = { :host => ENV['CHOUETTE_BASE_URL'] }
- end
-
+ end
+
# Configure the e-mail address which will be shown in Devise::Maile
if ENV['CHOUETTE_MAIL_SENDER'].nil?
config.mailer_sender = "chouette-production@my-domain-name.com"
@@ -111,28 +111,28 @@ Rails.application.configure do
:user_name => ENV['CHOUETTE_SMTP_USER'],
:password => ENV['CHOUETTE_SMTP_PASSWORD'],
:authentication => ENV['CHOUETTE_SMTP_AUTH'] }
- end
- #end
+ end
+ #end
# Specific theme for each company
# AFIMB
- config.company_name = "afimb"
+ config.company_name = "afimb"
config.company_theme = "#61970b" # AFIMB color
- config.company_contact = "http://www.chouette.mobi/contact-support/"
- config.accept_user_creation = true
+ config.company_contact = "http://www.chouette.mobi/club-utilisateurs/contact-support/"
+ config.accept_user_creation = true
# CITYWAY
# config.company_name = "cityway"
# config.company_theme = "#32adb0"
# config.company_contact = "http://www.cityway.fr/contact/?rub_code=14"
- # config.accept_user_creation = false
-
+ # config.accept_user_creation = false
+
# file to data for demo
config.demo_data = ENV['CHOUETTE_DEMO_DATA'].nil? ? "/path/to/demo.zip" : ENV['CHOUETTE_DEMO_DATA']
-
+
# link to validation specification pages
- config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
-
+ config.validation_spec = "http://www.chouette.mobi/neptune-validation/v21/"
+
# paths for external resources
config.to_prepare do
Devise::Mailer.layout "mailer"
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 255803abc..5fb3b1475 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -2,7 +2,7 @@ Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
config.eager_load = false
-
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
@@ -38,36 +38,36 @@ Rails.application.configure do
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
-
+
# Specific theme for each company
# AFIMB
- config.company_name = "afimb"
+ config.company_name = "afimb"
config.company_theme = "#61970b" # AFIMB color
- config.company_contact = "http://www.chouette.mobi/contact-support/"
+ config.company_contact = "http://www.chouette.mobi/club-utilisateurs/contact-support/"
config.accept_user_creation = true
-
+
# CITYWAY
# config.company_name = "cityway"
# config.company_theme = "#32adb0"
# config.company_contact = "http://www.cityway.fr/contact/?rub_code=14"
# config.accept_user_creation = false
-
+
# file to data for demo
config.demo_data = "tmp/demo.zip"
-
+
# link to validation specification pages
- config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/"
+ config.validation_spec = "http://www.chouette.mobi/neptune-validation/v21/"
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-
+
# Configure the e-mail address which will be shown in Devise::Maile
config.mailer_sender = "appli@chouette.mobi"
- config.action_mailer.delivery_method = :sendmail
+ config.action_mailer.delivery_method = :sendmail
# change to true to allow email to be sent during development
config.action_mailer.perform_deliveries = false
config.action_mailer.raise_delivery_errors = false
- config.action_mailer.default :charset => "utf-8"
-
+ config.action_mailer.default :charset => "utf-8"
+
config.i18n.available_locales = [:fr, :en]
end
diff --git a/public/help/2014-10-30_172801.png b/public/help/2014-10-30_172801.png
deleted file mode 100644
index dcd247503..000000000
--- a/public/help/2014-10-30_172801.png
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 08:36:14 +0000