merge shawarmou's changes

3 files changed, 43 insertions, 13 deletions

diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 94d45039b..6783cf6d6 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -9,9 +9,9 @@ div#root
       = f.input :number
   
   .row
-    .col-lg-5.col-md-5.col-sm-5.col-xs-5
+    .col-lg-6.col-md-6.col-sm-5.col-xs-5
       = f.input :comment
-    .col-lg-7.col-md-7.col-sm-7.col-xs-7
+    .col-lg-6.col-md-6.col-sm-7.col-xs-7
       = f.input :opposite_route, collection: @line.routes.select { |r| r.id != @route.id }
   
   .row
@@ -21,15 +21,27 @@ div#root
       = f.input :wayback_code, collection: Chouette::Route.waybacks, include_blank: false, member_label: Proc.new { |mode| t("waybacks.label.#{mode}") }
     .col-lg-4.col-md-4.col-sm-4.col-xs-4
       = f.input :objectid, required: !@route.new_record?, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.route.objectid") }
-      
-  .row
+  
+  .row style="margin-top:20px"
     .col-lg-12.col-md-12.col-sm-12.col-xs-12
-      = f.simple_fields_for :stop_points do |point|
-        = render 'stop_point_fields', f: point
+      #stop_points
+        div.clearfix style="margin-bottom:5px"
+          label style="margin:0" Arrêts
+          .btn.btn-primary.btn-xs.pull-right data-event="add_stop_point"
+            span.fa.fa-plus
+            = " #{t('routes.actions.add_stop_point')}"
+            
+          / = link_to_add_association f, :stop_points, class: 'btn btn-primary btn-xs pull-right' do
+          /   span.fa.fa-plus
+          /   = " #{t('routes.actions.add_stop_point')}"
+          / THIS IS BROKEN
+          / = link_to t('routes.actions.new_stop_point'), new_referential_stop_area_path(@referential), target: '_blank'
+        
+        .list-group
+          = f.simple_fields_for :stop_points do |point|
+            = render 'stop_point_fields', f: point
 
   .row
     .col-lg-12.col-md-12.col-sm-12.col-xs-12.text-right
       = link_to 'Annuler', :back, class: 'btn btn-link'
       = f.button :submit, class: 'btn btn-danger'
-
-
diff --git a/app/views/routes/_stop_point_fields.html.slim b/app/views/routes/_stop_point_fields.html.slim
index 922b400eb..38909f0f2 100644
--- a/app/views/routes/_stop_point_fields.html.slim
+++ b/app/views/routes/_stop_point_fields.html.slim
@@ -1,4 +1,22 @@
-= f.input :stop_area_id
-
-/ = link_to_add_association t("routes.actions.add_stop_point"), f, :stop_points
-/ = link_to t('routes.actions.new_stop_point'), new_referential_stop_area_path(@referential), target: '_blank'
+.list-group-item
+  div style="display:inline-block;vertical-align:middle;width:75%;"
+    - if f.object.stop_area.nil? || f.object.new_record?
+        = f.input :stop_area_id, label: false
+      
+    - else
+      = "#{@route.stop_areas.find(f.object.stop_area_id).name} "
+      em.small
+        = "#{@route.stop_areas.find(f.object.stop_area_id).zip_code} #{@route.stop_areas.find(f.object.stop_area_id).city_name}"
+    
+  div.text-right style="display:inline-block;vertical-align:middle;width:25%;"
+    .btn-group.btn-group-sm style="padding:0;"
+      .btn.btn-default
+        span.fa.fa-times
+      .btn.btn-primary
+        span.fa.fa-arrow-up
+      .btn.btn-primary
+        span.fa.fa-arrow-down
+      .btn.btn-danger
+        span.fa.fa-trash
+      / = link_to_remove_association f, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} do
+      /   span.fa.fa-trash
diff --git a/app/views/shared/_header.html.slim b/app/views/shared/_header.html.slim
index f75666cdc..58785f34c 100644
--- a/app/views/shared/_header.html.slim
+++ b/app/views/shared/_header.html.slim
@@ -7,7 +7,7 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
         span.icon-bar
         span.icon-bar
         span.icon-bar
-        span.icon-bar.version = APP_VERSION
+        / span.icon-bar.version = APP_VERSION
 
       = link_to referentials_path, class: 'navbar-brand' do
         / = image_tag("logo_chouette.png")