Initialize big css refactoring

2 files changed, 11 insertions, 23 deletions

diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
index a0a29d954..72d3b2046 100644
--- a/app/views/connection_links/_form.erb
+++ b/app/views/connection_links/_form.erb
@@ -4,31 +4,19 @@
     <%= form.input :name %>
     <%= form.input :connection_link_type, :as => :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }  %>
     <%= form.input :comment %>  
-    <%= form.input :link_distance %> 
-    <%= form.inputs :name => t('connection_links.show.durations') do %> 
-      <%= form.input "default_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
-      <%= form.input "default_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input "default_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input :default_duration, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("default_duration")%>
-      <%= form.input "frequent_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
-      <%= form.input "frequent_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input "frequent_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input :frequent_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("frequent_traveller_duration")%>
-      <%= form.input "occasional_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
-      <%= form.input "occasional_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input "occasional_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input :occasional_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("occasional_traveller_duration")%>
-      <%= form.input "mobility_restricted_traveller_duration(1i)", :as => :hidden ,:input_html => { :value => "2000" } %>
-      <%= form.input "mobility_restricted_traveller_duration(2i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input "mobility_restricted_traveller_duration(3i)", :as => :hidden ,:input_html => { :value => "1" } %>
-      <%= form.input :mobility_restricted_traveller_duration, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration")%>
-    <% end %>
-    <%= form.input :mobility_restricted_suitability,:as => :boolean %>
+    <%= form.input :link_distance %>
+      <%= form.input :mobility_restricted_suitability,:as => :boolean %>
     <%= form.input :stairs_availability,:as => :boolean %>
     <%= form.input :lift_availability,:as => :boolean %>
 
-    <%= form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :disabled => !@connection_link.new_record? } %>  
+    <%= form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :disabled => !@connection_link.new_record? } %>
   <% end %>
+  <%= form.inputs :name => t('connection_links.show.durations') do %> 
+    <%= form.input :default_duration, :as => :time_picker, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :placeholder => "HH:MM" } %>       
+    <%= form.input :frequent_traveller_duration, :as => :time_picker, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :placeholder => "HH:MM" } %>      
+    <%= form.input :occasional_traveller_duration, :as => :time_picker, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :placeholder => "HH:MM" } %>        
+    <%= form.input :mobility_restricted_traveller_duration, :as => :time_picker, :ignore_date=>true,:include_seconds=>true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :placeholder => "HH:MM" } %>
+  <% end %>  
 
    <%= form.actions do %>
      <%= form.action :submit, :as => :button %>
diff --git a/app/views/connection_links/index.html.erb b/app/views/connection_links/index.html.erb
index 8a19559ce..5f4ec09d4 100644
--- a/app/views/connection_links/index.html.erb
+++ b/app/views/connection_links/index.html.erb
@@ -31,10 +31,10 @@
   <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links %>
 </div>
 <div class="connection_links paginated_content">
-  <%= render :partial => "connection_link", :collection => @connection_links %>
+  <%= paginated_content(@connection_links) %>
 </div>
 <div class="pagination">
-  <%= will_paginate @connection_links, :container => false %>
+  <%= will_paginate @connection_links, :container => false, renderer: BootstrapPagination::Rails %>
 </div>
 
 <% content_for :sidebar do %>