Merge branch 'sismo' into gtfs_v2

9 files changed, 278 insertions, 7 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index 5d3324c74..4d7e28009 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,7 +1,7 @@
 require 'capistrano/ext/multistage'
 require './config/boot'
 
-set :stages, %w(sandbox unstable staging production)
+set :stages, %w(sandbox unstable staging production sismo)
 set :application, "chouette2"
 set :scm, :git
 set :repository,  "https://github.com/afimb/chouette2.git"
@@ -12,7 +12,7 @@ set :group_writable, true
 set :rake, "bundle exec rake"
 set :keep_releases, 4
 set :rails_env, "production" #added for delayed job
-set :user, "metienne"
+set :user, "ldonnet"
 set :deploy_via, :copy
 set :copy_via, :scp
 set :copy_exclude, ".git/*"
@@ -64,7 +64,7 @@ namespace :deploy do
   desc "Install chouette command"
   task :chouette_command, :except => { :no_release => true }  do
     run "mkdir -p /var/lib/chouette/imports"
-    run "mkdir -p /var/lib/chouette/imports"
+    run "mkdir -p /var/lib/chouette/exports"
     run "mkdir -p /var/lib/chouette/validations"
     run "mkdir -p /usr/local/opt/chouette-command/"
   end
diff --git a/config/deploy/sismo.rb b/config/deploy/sismo.rb
new file mode 100644
index 000000000..a8cb59006
--- /dev/null
+++ b/config/deploy/sismo.rb
@@ -0,0 +1,2 @@
+server "chouette-sismo.marseille.cityway.fr", :app, :web, :db, :primary => true
+set :branch, "V2_5"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 4aa6ef80d..8434a26c8 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,6 +1,7 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
@@ -242,3 +243,11 @@ Devise.setup do |config|
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
 end
+
+Rails.application.config.to_prepare do
+  Devise::SessionsController.layout "devise"
+  Devise::RegistrationsController.layout proc{ |controller| ( action_name == "edit") ? "application" : "devise" }
+  Devise::ConfirmationsController.layout "devise"
+  Devise::UnlocksController.layout "devise"            
+  Devise::PasswordsController.layout "devise"        
+end
diff --git a/config/initializers/remove_simple_form_bootstrap3_inputs.rb b/config/initializers/remove_simple_form_bootstrap3_inputs.rb
new file mode 100644
index 000000000..448487308
--- /dev/null
+++ b/config/initializers/remove_simple_form_bootstrap3_inputs.rb
@@ -0,0 +1,32 @@
+inputs = %w[
+  CollectionSelectInput
+   DateTimeInput
+   FileInput
+   GroupedCollectionSelectInput
+   NumericInput
+   PasswordInput
+   RangeInput
+   StringInput
+  TextInput
+]
+
+# Instead of creating top-level custom input classes like TextInput, we wrap it into a module and override
+# mapping in SimpleForm::FormBuilder directly
+#
+SimpleFormBootstrapInputs = Module.new
+inputs.each do |input_type|
+  superclass = "SimpleForm::Inputs::#{input_type}".constantize
+
+  new_class = SimpleFormBootstrapInputs.const_set(input_type, Class.new(superclass) do
+    def input_html_classes
+      super.push('form-control')
+    end
+  end)
+
+  # Now override existing usages of superclass with new_class
+  SimpleForm::FormBuilder.mappings.each do |(type, target_class)|
+    if target_class == superclass
+      SimpleForm::FormBuilder.map_type(type, to: new_class)
+    end
+  end
+end
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
new file mode 100644
index 000000000..e2ad34eee
--- /dev/null
+++ b/config/initializers/simple_form.rb
@@ -0,0 +1,142 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, :class => :input,
+    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input :placeholder => "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable the lookup for any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
+    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   :inline => input + label
+  #   :nested => label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'alert alert-error'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span. Please note that when using :boolean_style = :nested,
+  # SimpleForm will force this option to be a label.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  config.label_class = 'col-lg-2 control-label'
+
+  # You can define the class to use on all forms. Default is simple_form.
+  config.form_class = "simple_form form-horizontal"
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use default HTML5 validations (novalidate option).
+  # Default is enabled.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { :string => :prepend }
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # Default size for text inputs.
+  # config.default_input_size = 50
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = false
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+end
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
new file mode 100644
index 000000000..c3dd5e348
--- /dev/null
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -0,0 +1,58 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'col-lg-10' do |ba|
+      ba.use :input
+      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+    end
+  end
+
+  config.wrappers :form_without_label, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label    
+    b.wrapper :tag => 'div', :class => 'col-lg-12' do |ba|
+      ba.use :input
+      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+    end
+  end
+
+  config.wrappers :prepend, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
+        prepend.use :input
+      end
+      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+    end
+  end
+
+  config.wrappers :append, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+      input.wrapper :tag => 'div', :class => 'input-append' do |append|
+        append.use :input
+      end
+      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+    end
+  end
+
+  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
+  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :bootstrap
+  config.button_class = 'btn'
+  config.label_class = 'col-lg-2 control-label' 
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 0a42a021d..933eca4a3 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -11,7 +11,7 @@ en:
         title: Resend confirmation instructions
     registrations:
       new:
-        title: Sign up
+        title: "Sign up"
         commit: Sign up
       edit:
         title: "Your profile"
@@ -36,6 +36,7 @@ en:
   helpers:
     label:
       user:
+        email: "Email"
         organisation_name: "Organisation name"
         name: Full name
         password: Password
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index d3a60d9a0..cb45578e5 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -15,8 +15,8 @@ fr:
         title: Renvoyer le mail de confirmation
     registrations:
       new:
-        title: "S'inscrire"
-        commit: Créer un compte
+        title: "Inscrivez vous"
+        commit: "S'inscrire"
       edit:
         title: "Votre Profil"
         commit: Modifier
@@ -35,11 +35,12 @@ fr:
     links:
       sign_in: "Se connecter"
       sign_up: "S'inscrire"
-      new_password: Mot de passe oublié
+      new_password: "Mot de passe oublié?"
       new_confirmation: "Vous n'avez pas reçu les instructions de confirmation ?"
   helpers:
     label:
       user:
+        email: "Email"
         organisation_name: "Nom de l'organisation"
         name: Nom complet
         password: Mot de passe
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
new file mode 100644
index 000000000..0df11fe0f
--- /dev/null
+++ b/config/locales/simple_form.en.yml
@@ -0,0 +1,26 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Labels and hints examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+