Merge branch 'master' of github.com:dryade/chouette2

14 files changed, 102 insertions, 44 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 096cb6c48..c6eda254d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,10 @@
-# V2.1.a
-
-* Intégration des cartes du géoportail (IGN)
-
 # V2.0.3
 
 * Ajout des imports/export NeTex
 * Fonctionnement sous windows
 * Prise en compte de grandes quantités de calendriers.
 * Reprise des logs d'import Neptune
+* Intégration des cartes du géoportail (IGN)
 
 # V2.0.2
 
diff --git a/README.md b/README.md
index 35de4106e..eec3660eb 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,25 @@
 # Chouette2 [![Build Status](https://travis-ci.org/dryade/chouette2.png)](http://travis-ci.org/dryade/chouette2?branch=master) [![Dependency Status](https://gemnasium.com/dryade/chouette2.png)](https://gemnasium.com/dryade/chouette2) [![Code Climate](https://codeclimate.com/github/dryade/chouette2.png)](https://codeclimate.com/github/dryade/chouette2)
 
-Chouette2 is a web project in Ruby/Rails and can :
-* Exchange transport data : Neptune, GTFS, Netex, CSV
+Chouette2 is an open source web project in Ruby/Rails to edit and view transport offer. It's designed as an [SaaS](http://en.wikipedia.org/wiki/Software_as_a_service) platform and can :
+* Exchange transport data : [Neptune](http://www.chouette.mobi/spip.php?rubrique61), [GTFS](https://developers.google.com/transit/gtfs/reference?hl=fr), [NeTEx](http://www.kizoom.com/standards/netex/), CSV
 * Edit transport data
 * Validate transport data
-* Offer a Restful API in read-only
-* Import and Export Data asynchronously                
+* Offer a [Restful API](https://en.wikipedia.org/wiki/Representational_state_transfer) in read-only
+* Import and Export Data asynchronously
+* Use [multi-tenancy database](http://en.wikipedia.org/wiki/Multitenancy)
+
+It uses java library from another git project to import and export various transport data [chouette](http://github.com/dryade/chouette)
+
+Feel free to test and access to the demonstration web site at [http://www.chouette.mobi](http://www.chouette.mobi/chouette2/users/sign_in). Two types of access are granted : 
+* A demo organisation with a set of data
+  * login : demo@chouette.mobi
+  * password : chouette
+* Create your own organisation : Must follow the link "Sign up" ("S'inscrire")
 
 Requirements
 ------------
  
-This code has been run and tested on [travis](http://travis-ci.org/dryade/chouette2?branch=master) with : 
+This code has been run and tested on [Travis](http://travis-ci.org/dryade/chouette2?branch=master) with : 
 * Ruby 1.8.7
 * JRuby 1.6.8 (oraclejdk7, openjdk7, openjdk6)
 
@@ -22,31 +31,21 @@ sudo apt-get install postgresql
 sudo apt-get install pgadmin3 
 sudo apt-get install openjdk-7-jdk 
 sudo apt-get install git 
+sudo apt-get install unzip
 ```
 
 Installation
 ------------
  
-Install [Postgres] (https://github.com/dryade/chouette2/doc/install/postgresql.md)
+Install [Postgres] (https://github.com/dryade/chouette2/blob/master/doc/install/postgresql.md)
 
-Install [JRuby] (https://github.com/dryade/chouette2/doc/install/jruby.md)
+Install [JRuby] (https://github.com/dryade/chouette2/blob/master/doc/install/jruby.md)
 
 Get git code : 
 ```sh
 cd workspace
 git clone -b V2_0_3 git://github.com/dryade/chouette2
-```
-
-Install chouette-gui-command to import and export transport offer : 
-```sh
-sudo mkdir -p /usr/local/opt/chouette-command/
-cd /usr/local/opt/chouette-command/
-
-sudo unzip /home/chouette/workspace/chouette/chouette-gui-command/target/chouette-cmd_2.0.3.zip
-sudo mv chouette-cmd_2.0.3 chouette-gui-2.0.3
-cd chouette-cmd_2.0.3
-sudo chmod a+x chouette
-sudo chmod a+w .
+cd chouette2
 ```
 
 **JRuby**
@@ -59,6 +58,16 @@ sudo apt-get install libproj-dev
 sudo apt-get install make
 ```
 
+Install chouette-gui-command to import and export transport offer : 
+```sh
+sudo mkdir -p /usr/local/opt/chouette-command/
+cd /usr/local/opt/chouette-command/
+wget http://chouette.dryade.net/chouette-cmd_2.0.3.zip
+unzip chouette-cmd_2.0.3.zip
+cd chouette-cmd_2.0.3
+sudo chmod a+w .
+```
+
 Build War ( Use RAILS_ENV production mode and parameters )
 ```sh 
 jgem install bundler --version 1.2.4
@@ -78,8 +87,20 @@ sudo chmod a+x /var/lib/chouette/imports /var/lib/chouette/exports /var/lib/chou
 ```
 
 **Ruby**
+Install chouette-gui-command to import and export transport offer : 
+```sh
+sudo mkdir -p tmp/chouette-command/
+cd tmp/chouette-command/
+wget http://chouette.dryade.net/chouette-cmd_2.0.3.zip
+unzip chouette-cmd_2.0.3.zip
+cd chouette-cmd_2.0.3
+sudo chmod a+w .
+```
+
+Install
 ```sh
 gem install bundler
+bundle install
 bundle exec rake db:create
 ```
 
@@ -99,31 +120,33 @@ There is extensive usage documentation available [on the wiki](https://github.co
 API Documentation
 -----------------
 
-You can view the [xsd file](https://github.com/dryade/chouette2/doc/interfaces/api_rest_v1.xsd) for the API
-
-
-
+The description of the restful API is described in : 
+* [User manual file](https://github.com/dryade/chouette2/blob/master/doc/interfaces/Chouette_API_REST_v1.2.pdf)
+* [XSD file](https://github.com/dryade/chouette2/blob/master/doc/interfaces/api_rest_v1.xsd)
 
 Example Usage 
 -------------
 
+Launch the task to import and export asynchronously
 ```sh
 bundle exec rake jobs:work
-bundle exec rails server
 ```
 
+Launch rails server
+```sh
+bundle exec rails server
+```    
 
 License
 -------
  
-This project is licensed under the CeCILL-B license, a copy of which can be found in the [LICENSE](http://github.com/dryade/chouette2/LICENSE.md) file.
+This project is licensed under the CeCILL-B license, a copy of which can be found in the [LICENSE](https://github.com/dryade/chouette2/blob/master/LICENSE.md) file.
 
 Release Notes
 -------------
 
-The release notes can be found in [CHANGELOG](http://github.com/dryade/chouette2/CHANGELOG.md) file 
+The release notes can be found in [CHANGELOG](https://github.com/dryade/chouette2/blob/master/CHANGELOG.md) file 
  
-
 Support
 -------
  
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index 22c2eb8ab..5800a767e 100644
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -10,12 +10,20 @@ $text_color: #222;
 p.after_map {
   clear: both;
 }
-#header .infos div.title
+
+#header .infos div.version
 {
-    margin: 20px 0 0 30px;
+    float: left;
+    padding: 50px 0 0 0;
+    font-weight: bold;
+    color: white;
+}
 
+#header .infos div.title
+{
+    padding: 20px 0 0 150px;
     h1 {
-        font-family: "Comic Sans", "Comic Sans MS", cursive;    
+        font-family: Arial, Verdana, Helvetica, sans-serif;
         font-size: 32px;      
         font-weight: bold;
         padding: 0px;
diff --git a/app/views/help/exports.textile b/app/views/help/exports.textile
index 79dda1b20..9566a70be 100644
--- a/app/views/help/exports.textile
+++ b/app/views/help/exports.textile
@@ -10,6 +10,7 @@ p. L'export permet d'extraire de la base un ensemble de données selon un format
 h3. Formats disponibles
 
 - Neptune := format normalisé des échanges de données de transport en commun pour la France (cf "Normalisation":normalisation)
+- NeTEx := format d'échanges de données de transport en commun expérimental sur la norme européenne NeTEx mais limité aux données définies dans la norme Neptune
 - CSV := format tabulaire spécifique à Chouette (cf "CSV":csv)
 - GTFS := format destiné à ["Google Transit":https://developers.google.com/transit/gtfs/?hl=fr]
 
diff --git a/app/views/help/imports.textile b/app/views/help/imports.textile
index 9412dfdb3..c48acd3bc 100644
--- a/app/views/help/imports.textile
+++ b/app/views/help/imports.textile
@@ -10,8 +10,9 @@ p. L'import permet d'enregistrer dans la base un ensemble de données selon un f
 h3. Formats disponibles
 
 - Neptune := format normalisé des échanges de données de transport en commun pour la France (cf "Normalisation":normalisation)
+- NeTEx := format d'échanges de données de transport en commun expérimental sur la norme européenne NeTEx mais limité aux données définies dans la norme Neptune
 - CSV := format tabulaire spécifique à Chouette  (cf "CSV":csv)
-- GTFS := format originaire de ["Google Transit":https://developers.google.com/transit/gtfs/?hl=fr]
+- GTFS := format originaire de ["Google Transit":https://support.google.com/transitpartners/], à condition que le fichier soit préalablement validé avec l'outil Feed Validator
 
 h3. Consultation des résultats
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 77873a855..32e74973f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,6 +21,9 @@
         <div class="logo"> 
           <%= link_to image_tag("logo_chouette.png"), referentials_path %>
         </div>
+        <div class="version">
+          <%= APP_VERSION %>
+        </div>
         <div class="title"> 
           <% if selected_referential? %>
             <h1><%= @referential.name %></h1>
diff --git a/app/views/test_sheet/toc.html b/app/views/test_sheet/toc.html
index ce280322e..b0c9f1be8 100644
--- a/app/views/test_sheet/toc.html
+++ b/app/views/test_sheet/toc.html
@@ -44,9 +44,6 @@ h3. Définition des tests
 ** "Fiche 3.9":3_9
 ** "Fiche 3.10":3_10
 ** "Fiche 3.11":3_11
-** "Fiche 3.12":3_12
-** "Fiche 3.13":3_13
-** "Fiche 3.14":3_14
 ** "Fiche 3.15":3_15
 ** "Fiche 3.16":3_16
 ** "Fiche 3.17":3_17
diff --git a/config/environment.rb b/config/environment.rb
index cc30ece2d..e82bdc5f6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,9 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
+
 # Initialize the rails application
 ChouetteIhm::Application.initialize!
+
+# Fix version
+APP_VERSION = '2.0.3'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 963f19035..001fbc8fb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -112,7 +112,7 @@ ChouetteIhm::Application.configure do
   else
     config.to_prepare do
       Devise::Mailer.layout "mailer"
-      Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-gui-2.0.3/chouette"
+      Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-cmd-2.0.3/chouette"
       Import.root = "/var/lib/chouette/imports"
       Export.root = "/var/lib/chouette/exports"
       FileValidation.root = "/var/lib/chouette/validations"
diff --git a/config/locales/journey_patterns.yml b/config/locales/journey_patterns.yml
index 120e27d1d..e4a961f4e 100644
--- a/config/locales/journey_patterns.yml
+++ b/config/locales/journey_patterns.yml
@@ -39,6 +39,10 @@ en:
         object_version: "Version"
         creation_time: "Created on"
         creator_id: "Created by"
+  formtastic:
+    hints:
+      journey_pattern:
+        objectid: "[prefix]:JourneyPattern:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
   journey_patterns:
@@ -81,3 +85,7 @@ fr:
         object_version: "Version"
         creation_time: "Créé le"
         creator_id: "Créé par"
+  formtastic:
+    hints:
+      journey_pattern:
+        objectid: "[prefixe]:JourneyPattern:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 23406fcc8..288dc539e 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -45,7 +45,7 @@ en:
         name: "Name"
         published_name: "Published name"
         number: "Number"
-        transport_mode: "Transport mode"
+        transport_mode_name: "Transport mode"
         group_of_line: "Group of lines"
         comment: "Comments"
         objectid: "Neptune identifier"
@@ -103,9 +103,9 @@ fr:
         company: "Transporteur"
         registration_number: "Numéro d'enregistrement"
         name: "Nom"
-        published_name: "Nom public"        
+        published_name: "Nom public"
         number: "Indice"
-        transport_mode: "Mode de transport"
+        transport_mode_name: "Mode de transport"
         group_of_line: "Groupe de lignes"
         comment: "Commentaire"
         objectid: "Identifiant Neptune"
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index 5e6b12f9f..bd6051d0e 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -52,6 +52,10 @@ en:
         object_version: "Version"
         creation_time: "Created on"
         creator_id: "Created by"
+  formtastic:
+    hints:
+      route:
+        objectid: "[prefix]:Route:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
   routes:
@@ -107,5 +111,9 @@ fr:
         creation_time: "Créé le"
         creator_id: "Créé par"
         no_journey_pattern: "Pas de mission"
+  formtastic:
+    hints:
+      route:
+        objectid: "[prefixe]:Route:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
 
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 70e1d043f..fa52c423b 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -59,7 +59,7 @@ en:
         company: "Company"
         comment: "Comments"
         status_value: "Status Value"
-        transport_mode: "Transport Mode"
+        transport_mode_name: "Transport Mode"
         published_journey_name: "Published Name"
         published_journey_identifier: "Published Identifier"
         facility: "Facility"
@@ -74,6 +74,10 @@ en:
       models:
         vehicle_journey:
           invalid_times: "Invalid times"
+  formtastic:
+    hints:
+      vehicle_journey:
+        objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
   vehicle_journeys:
@@ -136,7 +140,7 @@ fr:
         company: "Transporteur"
         comment: "Commentaires"
         status_value: "Etat de trafic"
-        transport_mode: "Mode de transport"
+        transport_mode_name: "Mode de transport"
         published_journey_name: "Nom public"
         published_journey_identifier: "Identifiant public"
         facility: "Equipement"
@@ -151,4 +155,8 @@ fr:
       models:
         vehicle_journey:
           invalid_times: "Horaires invalides"
+  formtastic:
+    hints:
+      vehicle_journey:
+        objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
diff --git a/doc/interfaces/Chouette_API_REST_v1.2.pdf b/doc/interfaces/Chouette_API_REST_v1.2.pdf
new file mode 100644
index 000000000..e257a9ada
--- /dev/null
+++ b/doc/interfaces/Chouette_API_REST_v1.2.pdf