Merge branch 'sismo' into gtfs_v2

5 files changed, 106 insertions, 54 deletions

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index f285a0f6d..68fd8c22a 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,13 +1,13 @@
-<%= title_tag t('.title') %>
+<div class="panel panel-default">
+  <div class="panel-heading"><%= t('.title') %></div>
+  <div class="panel-body">
+    <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |form| %>
+      <%= form.input :email %> 
 
-<%= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |form| %>
-  <%= form.inputs :email %> 
-  
-  <%= form.actions do %>
-    <%= form.action :submit, :as => :button, :label => t('.commit') %>
-    <%= form.action :cancel, :as => :link %>
-  <% end %>
+      <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+      <%= form.button :submit, :value => t("devise.passwords.new.commit") %>
+    <% end %>
+  </div>
+</div>
 
-<% end %>
 
-<%= render "links" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 79edcb53b..9c780cba3 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,22 +1,26 @@
-<%= title_tag t('.title') %>
+<div id="registrations_new" class="col-lg-offset-4 col-lg-4">
 
-<%= semantic_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |form| %>
-  <%= form.inputs do %>
-    <%= form.semantic_fields_for :organisation, Organisation.new do |organisation| %>
-      <%= organisation.input :name, :label => t("helpers.label.user.organisation_name") %>
+    <% if Rails.application.config.accept_user_creation %>
+    <div class="panel panel-default">
+      <div class="panel-heading"><%= t("devise.registrations.new.title") %></div>
+      <div class="panel-body">        
+        <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label" ) do |form| %>
+        <%= form.simple_fields_for :organisation, Organisation.new do |organisation| %>
+          <%= organisation.input :name, :label => false, :placeholder => t("helpers.label.user.organisation_name"), input_html: { :class => "form-control" } %>
+        <% end %>
+        <% if resource.respond_to?( :name) %>
+          <%= form.input :name, :label => false, :placeholder => t("helpers.label.user.name"), input_html: { :class => "form-control" }  %> 
+        <% end %>    
+        <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %> 
+        <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %> 
+        <%= form.input :password_confirmation, :as => :password, :label => false, :placeholder => t("helpers.label.user.password_confirmation"), input_html: { :class => "form-control" } %> 
+        
+        <%= form.button :submit, :class => "btn-primary" %>
+        <% end %>
+      </div>
+    </div>
     <% end %>
-    <% if resource.respond_to?( :name) %>
-      <%= form.input :name %> 
-      <% end %>    
-    <%= form.input :email %> 
-    <%= form.input :password, :as => :password %> 
-    <%= form.input :password_confirmation, :as => :password %> 
-  <% end %>  
+    
+</div>
 
-   <%= form.actions do %>
-     <%= form.action :submit, :as => :button, :label => t('.commit') %>
-     <%= form.action :cancel, :as => :link %>
-  <% end %>
-<% end %>
 
-<%= render "links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index a6c13df5d..dc06a3ea2 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,19 +1,65 @@
-<%= title_tag t('.title') %>
+<div id="sessions_new" class="row">
+  <div class="col-md-8 product_summary">
+    <h2>Bienvenue sur Chouette</h2>
+    <p>
+     Chouette est un logiciel Open Source de saisie, de visualisation et d'échange d'offre de transport public planifiée.
+    </p>
+    <p>
+      Ce logiciel est déployé en mode Saas et se veut ouvert :      
+    </p>
+    <ul>
+      <li>- choix de plusieurs fonds cartographiques</li>
+      <li>- échange de données en différents normes (Neptune, ...) et standard (GTFS, ...)</li>
+    </ul>
+  </div>
+  <div class="col-md-4 login">
+    <div class="panel panel-default">
+      <div class="panel-body">
+        <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :wrapper => "form_without_label" ) do |form| %>    
+          <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %>
+          <div class="row">
+            <div class="col-md-6">
+              <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %>
+            </div>
+            <div class="col-md-6">
+              <%= form.button :submit, t("devise.sessions.new.commit"), :class => "btn-primary" %>
+            </div>
+          </div>
+          <div class="row options">
+            <div class="col-md-6">
+              <% if devise_mapping.rememberable? %>
+                <%= form.input :remember_me, :as => :boolean, :label => false, :inline_label => t("helpers.label.user.remember_me") if devise_mapping.rememberable? %>
+              <% end %>
+            </div>
+            <div class="col-md-6 new_password">
+              <%= link_to t("devise.links.new_password"), new_password_path(resource_name) %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
 
-<%= semantic_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |form| %>
-  <%= form.inputs do %> 
-    <%= form.input :email %> 
-    <%= form.input :password, :as => :password %> 
-
-    <% if devise_mapping.rememberable? -%>
-      <%= form.input :remember_me, :as => :boolean %>
+    <% if Rails.application.config.accept_user_creation %>
+    <div class="panel panel-default">
+      <div class="panel-heading"><%= t("devise.registrations.new.title") %></div>
+      <div class="panel-body">        
+        <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label" ) do |form| %>
+        <%= form.simple_fields_for :organisation, Organisation.new do |organisation| %>
+          <%= organisation.input :name, :label => false, :placeholder => t("helpers.label.user.organisation_name"), input_html: { :class => "form-control" } %>
+        <% end %>
+        <% if resource.respond_to?( :name) %>
+          <%= form.input :name, :label => false, :placeholder => t("helpers.label.user.name"), input_html: { :class => "form-control" }  %> 
+        <% end %>    
+        <%= form.input :email, :label => false, :placeholder => t("helpers.label.user.email"), input_html: { :class => "form-control" } %> 
+        <%= form.input :password, :as => :password, :label => false, :placeholder => t("helpers.label.user.password"), input_html: { :class => "form-control" } %> 
+        <%= form.input :password_confirmation, :as => :password, :label => false, :placeholder => t("helpers.label.user.password_confirmation"), input_html: { :class => "form-control" } %> 
+        
+        <%= form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info" %>
+        <% end %>
+      </div>
+    </div>
     <% end %>
-  <% end %>  
-
-
-   <%= form.actions do %>
-     <%= form.action :submit, :as => :button, :label => t('.commit') %>
-  <% end %>
-<% end %>
+    
+  </div>
+</div>
 
-<%= render "links" %>
diff --git a/app/views/layouts/without_sidebar.html.erb b/app/views/layouts/devise.html.erb
index c61dc6b25..60c531780 100644
--- a/app/views/layouts/without_sidebar.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -16,23 +16,25 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
   </head>
-  <body>
+  <body id="devise">
     <div id="header">
       <%= render partial: "shared/header" %>
     </div>
-    <div id="middle" class="container">
-      <div class="row">
-        <div class="col-md-12">
+    <div class="front_bg">      
+      <div id="devise_middle" class="container">
+        <div class="row">
+        <div class="<%= content_for?(:sidebar) ? 'col-md-9' : 'col-md-12' %>">
           <div id="workspace" class="<%= controller_name %> <%= action_name %>">
             <%= render partial: "shared/flash_messages", flash: flash %>
             <%= render partial: "shared/breadcrumb" %>
             <%= yield %>
           </div>
         </div>
+        </div>
       </div>
-    </div>
-    <div id="footer">
-      <%= render partial: "shared/footer" %>
-    </div>
+      <div id="footer">
+        <%= render partial: "shared/footer" %>
+      </div>
+    </div>    
   </body>
 </html>
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 3b7c90926..380f5b520 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -10,10 +10,10 @@
         <span class="icon-bar version"><%= APP_VERSION %></span>
       </button>
       <%= link_to referentials_path, :class =>"navbar-brand" do %>
-       <%= image_tag("logo_chouette.png") %><span class="brand_name">CHOUETTE</span></i><span class="version"><%= APP_VERSION %></span>
+       <%= image_tag("logo_chouette.png") %>       
       <% end %>
+      <p class="navbar-text"><span class="brand_name">CHOUETTE</span></i><span class="version"><%= APP_VERSION %></span></p>  
     </div>
-
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">