Fix css for footnotes in vehicle journey edit

3 files changed, 4 insertions, 7 deletions

diff --git a/app/assets/stylesheets/vendor/formtastic_changes.css.scss b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
index d64d6925f..7eb6b10c5 100644
--- a/app/assets/stylesheets/vendor/formtastic_changes.css.scss
+++ b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
@@ -29,10 +29,6 @@
         font-size: 14px !important;
         width: 100% !important;
     }    
-
-    .choice label input{
-        margin: 0px 0px 0px -20px !important;
-    }
     
     .token-input-list {
         display: inline-block;
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 3acc22950..0212ae4ea 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -13,6 +13,7 @@
     <%= form.input :vehicle_type_identifier%>
     <%= form.input :objectid, :required => !@vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles.vehicle_journey.objectid")} %>
     <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => referential_autocomplete_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => Rabl::Renderer.new( 'autocomplete_time_tables/index', @vehicle_journey.time_tables, :view_path => 'app/views', :format => :json, :scope => :self ).render }  %>
+    <%= form.input :footnote_ids, :as => :check_boxes, :collection => @line.footnotes.map { |f| [ "#{f.code}: #{f.label}", f.id.to_s]} %>
     <li class="input">
 	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
     </li>
@@ -50,9 +51,7 @@
 	      :collection => @vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop, :locals => { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size } %>
 
       </tbody>
-    </table>
-
-    <%= form.input :footnote_ids, :label => "mon label", :as => :check_boxes, :collection => @line.footnotes.map { |f| [ "#{f.code} #{f.label}", f.id.to_s]} %>
+    </table>    
 
   <% end %>
 
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 05eb1c4cb..4ff947321 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -90,6 +90,7 @@ en:
         object_version: "Version"
         creation_time: "Created on"
         creator_id: "Created by"
+        footnote_ids: "Footnotes"
     errors:
       models:
         vehicle_journey:
@@ -191,6 +192,7 @@ fr:
         object_version: "Version"
         creation_time: "Créé le"
         creator_id: "Créé par"
+        footnote_ids: "Notes de bas de page"
     errors:
       models:
         vehicle_journey: