Merge branch 'V2_5' of github.com:afimb/chouette2 into V2_5

8 files changed, 42 insertions, 29 deletions

diff --git a/app/assets/stylesheets/modules/devise.css.scss b/app/assets/stylesheets/modules/devise.css.scss
index 8236366ce..b4a1d2076 100644
--- a/app/assets/stylesheets/modules/devise.css.scss
+++ b/app/assets/stylesheets/modules/devise.css.scss
@@ -1,6 +1,12 @@
 #devise{
     background-color: $gray-light;
 
+    .passwords.new{
+        input{
+            width: initial !important;
+        }
+    }
+    
     .front_bg{        
         background: url(image-path('welcome.jpg')) no-repeat center center;
         background-size: cover;
diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb
index 6897b88c9..4bbefbc1a 100644
--- a/app/helpers/journey_patterns_helper.rb
+++ b/app/helpers/journey_patterns_helper.rb
@@ -1,13 +1,15 @@
 module JourneyPatternsHelper
+
   def journey_name( journey_pattern)
     if journey_pattern.name.blank?
-      t('journey_patterns.journey_pattern.from_to', 
+      truncate( t('journey_patterns.journey_pattern.from_to', 
         :departure => journey_pattern.stop_points.first.stop_area.name, 
-        :arrival => journey_pattern.stop_points.last.stop_area.name)
+        :arrival => journey_pattern.stop_points.last.stop_area.name), :length => 30)
     else
       truncate(journey_pattern.name, :length => 30)
     end
   end
+  
   def stop_point_ids_label(journey_pattern)
     return journey_pattern.human_attribute_name(:stop_point_ids) if journey_pattern.vehicle_journeys.empty?
 
diff --git a/app/helpers/lines_helper.rb b/app/helpers/lines_helper.rb
index 623d091ca..80073af62 100644
--- a/app/helpers/lines_helper.rb
+++ b/app/helpers/lines_helper.rb
@@ -16,4 +16,13 @@ module LinesHelper
   def background_color(line)
     line.color.blank? ? "white" : "#"+line.color
   end
+  
+  def number_style(line)
+    if colors?(line)
+      number_style = "color: #{text_color(line)}; background-color: #{background_color(line)};"
+    else 
+      number_style = ""
+    end
+
+  end
 end
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index 2ee8123b5..95741f441 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -1,13 +1,4 @@
 module VehicleJourneysHelper
-  def journey_name( journey_pattern)
-    if !journey_pattern.published_name.blank?
-      journey_pattern.published_name.first(8)
-    elsif !journey_pattern.name.blank?
-      journey_pattern.name.first(8)
-    else
-      journey_pattern.id
-    end
-  end
   
   def vehicle_name( vehicle)
     if !vehicle.published_journey_name.blank?
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 68fd8c22a..865805319 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,12 +1,16 @@
-<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 %> 
+<div class="col-md-offset-2 col-md-8">
+  <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, :as => :email, placeholder: 'user@domain.com'  %> 
 
-      <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
-      <%= form.button :submit, :value => t("devise.passwords.new.commit") %>
-    <% end %>
+      <div class="col-md-offset-2">
+        <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+        <%= form.button :submit, :value => t("devise.passwords.new.commit"), :class => "btn-info" %>
+      </div>
+      <% end %>
+    </div>
   </div>
 </div>
 
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 1ac92d989..79d3b02e9 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -3,7 +3,7 @@ layout: default
 title: Chouette v2 
 ---
 
-Version 2.5.0
+Version 2.5.1
 
 h3. Logiciel libre propriété de :
 
@@ -24,6 +24,14 @@ A cet égard  l'attention de l'utilisateur est attirée sur les risques associé
 
 h3. Notes de version
 
+h4. Version 2.5.1
+
+* Nouvelles foctionnalités :
+** refonte de l'import/export GTFS
+** ajout des couleurs de lignes
+** ajout de l'URL d'une page web pour les transporteurs, lignes et les arrêts
+** ajout du fuseau horaire pour les transporteurs et les arrêts.
+
 h4. Version 2.5.0
 
 * Nouvelles foctionnalités :
diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb
index 24450fa20..5962cd64f 100644
--- a/app/views/lines/_line.erb
+++ b/app/views/lines/_line.erb
@@ -12,14 +12,7 @@
       <h5>
         <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %>
         <% if line.number and line.number.length <= 3 %>
-           <% if !line.text_color.blank? || !line.color.blank? %>
-             <% text_color = line.text_color.blank? ? "black" : "##{line.text_color}" %>
-             <% bg_color = line.color.blank? ? "white" : "##{line.color}" %>
-             <% number_style = "color: #{text_color}; background-color: #{bg_color};" %>
-           <% else %>
-             <% number_style = "" %>
-           <% end %>
-           <span class="label label-default line_number" style="<%= number_style %>"><%= line.number %></span>
+           <span class="label label-default line_number" style="<%= number_style(line) %>"><%= line.number %></span>
         <% end %>      
         <%= link_to([@referential, line], :class => "preview", :title => "#{Chouette::Line.model_name.human.capitalize} #{line.name}") do %>          
         <span class="name">          
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 12af00ff7..5983aaca0 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -12,7 +12,7 @@
     <% if colors?(@line) %>
 	    <p>
 	    	<label><%= t('lines.index.color') %>: </label>
-	    	<label class="color" style='<%="color: #{text_color(@line)}; background-color: #{background_color(@line)};"%>'><%= line_sticker(@line) %></label>
+	    	<label class="color" style='<%="#{number_style(@line)}"%>'><%= line_sticker(@line) %></label>
 	    </p>	
     <% end %>
     <p>