Merge pull request #220 from eddie-ruva/features/fixing_map

[#218] Fixes map interaction
CodeandoMexico · Feb 25, 2014 · e2e59de · e2e59de
2 parents 5b6b3c7 + c729847
commit e2e59de
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 95 deletions.
diff --git a/app/assets/javascripts/geolocate_map/geolocateMap.js.coffee b/app/assets/javascripts/geolocate_map/geolocateMap.js.coffee
@@ -1,7 +1,7 @@
 class window.GeolocateMap
 
   constructor: (map_div_node, options) ->
-    $(map_div_node).after("<p class='error-map alert alert-danger' style='display:none;'>Lo sentimos tu dirección esta fuera del alcance permitido</p>")
+    $(map_div_node).before("<p class='error-map alert alert-danger' style='display:none;'>Lo sentimos tu dirección esta fuera del alcance permitido</p>")
     @_prepare_inputs(options['sync_input'])
     @map = new GeolocateMap.Map(map_div_node, options)
     @_add_listener_for_first_location()
@@ -15,9 +15,7 @@ class window.GeolocateMap
 
   _add_listener_for_marker: ->
     @map.marker.onDragEnd =>
-      if @map.validates_position(@map.marker.g_marker.getPosition())
-        @_update_form_from_marker_values()
-      else
+      unless @map.validates_position(@map.marker.g_marker.getPosition())
         @map.marker.rollback_to_last_valid_position()
         @_display_map_error()
 

diff --git a/app/assets/stylesheets/shared/layout.scss b/app/assets/stylesheets/shared/layout.scss
@@ -18,6 +18,10 @@
   display: block;
 }
 
+.l-page-header-no-margin {
+  margin-top: 0px;
+}
+
 #wrap {
   min-height: 100%;
   height: auto !important;

diff --git a/app/views/admins/service_requests/_form.html.haml b/app/views/admins/service_requests/_form.html.haml
diff --git a/app/views/admins/service_requests/new.html.haml b/app/views/admins/service_requests/new.html.haml
@@ -3,7 +3,6 @@
 
 .page-content.inset
   .row
-    .col-md-6
-      = render 'form'
-    .col-md-6
-      #new-report-map{'data-map-constraints' => current_map_constrainsts}
+    .col-md-12
+      = form_for [:admins, @service_request], html: { class: "form-horizontal", role: 'form'} do |f|
+        = render 'service_requests/form', f: f
diff --git a/app/views/service_fields/_service_field.html.haml b/app/views/service_fields/_service_field.html.haml
@@ -1,6 +1,6 @@
 .form-group
-  = label_tag "service_request[service_fields][#{service_field.id}]", service_field.name.capitalize, class: 'col-lg-3 control-label'
-  .col-lg-9
+  = label_tag "service_request[service_fields][#{service_field.id}]", service_field.name.capitalize, class: 'col-md-2 control-label'
+  .col-md-10
     - if @service_request.nil?
       = text_field_tag "service_request[service_fields][#{service_field.id}]", nil, class: 'form-control'
     - else

diff --git a/app/views/service_requests/_form.html.haml b/app/views/service_requests/_form.html.haml
@@ -1,41 +1,45 @@
-= form_for @service_request, html: {class: "form-horizontal", role: 'form'} do |f|
-
-  .form-group
-    = f.label :service_id, t('form.labels.service'), class: 'col-lg-3 control-label'
-    .col-lg-9
-      = f.select :service_id, Service.all.collect {|p| [ p.name, p.id ] }, { include_blank: true }, { class: 'js-load_service_fields form-control' }
-      = errors_on_resource_for_field(@service_request, :service_id)
-
-  %div#service_fields_container
-    = render @service_request.service.service_fields if @service_request.service?
-
-  .form-group
-    = f.label :address, t('form.labels.address'), class: 'col-lg-3 control-label'
-    .col-lg-9
-      = f.text_area :address, id: 'address', rows: '5', class: 'form-control'
-
-  .form-group
-    = f.label :description, t('form.labels.description'), class: 'col-lg-3 control-label'
-    .col-lg-9
-      = f.text_area :description, class: 'form-control', rows: '5'
-      = errors_on_resource_for_field(@service_request, :description)
-
-  .form-group
-    = f.label :media, t('form.labels.image'), class: 'col-lg-3 control-label'
-    .col-lg-9
-      = f.file_field :media, class: 'js-image-preview'
-      .image_preview
-
-  .form-group
-    .col-lg-offset-3.col-lg-9
-      .checkbox
-      = f.label :anonymous do
-        = f.check_box :anonymous
-        = t('.anonymise')
-
-  = f.hidden_field :lat, id: 'lat'
-  = f.hidden_field :lng, id: 'lng'
-
-  .form-group
-    .col-lg-offset-3.col-lg-9
-      = f.submit t('save'), class: "btn btn-primary"
+.form-group
+  = f.label :service_id, t('form.labels.service'), class: 'col-md-2 control-label'
+  .col-md-10
+    = f.select :service_id, Service.all.collect {|p| [ p.name, p.id ] }, { prompt: t('.prompt_service') }, { class: 'js-load_service_fields form-control' }
+    = errors_on_resource_for_field(@service_request, :service_id)
+
+%div#service_fields_container
+  = render @service_request.service.service_fields if @service_request.service?
+
+.form-group
+  = f.label :address, t('form.labels.address'), class: 'col-md-2 control-label'
+  .col-md-10
+    = f.text_area :address, id: 'address', rows: '5', class: 'form-control', placeholder: t('.address_placeholder')
+
+.form-group
+  = f.label :lat, 'Ubicación en mapa', class: 'col-md-2 control-label'
+  .col-md-10
+    = f.hidden_field :lat, id: 'lat'
+    = f.hidden_field :lng, id: 'lng'
+    .help-block= t('.map_help')
+    #new-report-map{'data-map-constraints' => current_map_constrainsts}
+
+.form-group
+  = f.label :description, t('form.labels.description'), class: 'col-md-2 control-label'
+  .col-md-10
+    = f.text_area :description, class: 'form-control', rows: '5', placeholder: t('.description_placeholder')
+    = errors_on_resource_for_field(@service_request, :description)
+
+.form-group
+  = f.label :media, t('form.labels.image'), class: 'col-md-2 control-label'
+  .col-md-10
+    = f.file_field :media, class: 'js-image-preview'
+    .image_preview
+
+.form-group
+  .col-md-offset-2.col-md-10
+    .checkbox
+    = f.label :anonymous do
+      = f.check_box :anonymous
+      = t('.anonymise')
+
+
+.form-group
+  .col-md-offset-2.col-md-10
+    = f.submit t('save'), class: "btn btn-primary"
diff --git a/app/views/service_requests/new.html.haml b/app/views/service_requests/new.html.haml
@@ -1,7 +1,7 @@
-%h1= t('.header')
+.page-header.l-page-header-no-margin
+  %h1= t('.header')
 
 .row
-  .col-md-6
-    = render 'form'
-  .col-md-6
-    #new-report-map{'data-map-constraints' => current_map_constrainsts}
+  .col-md-12
+    = form_for @service_request, html: {class: "form-horizontal", role: 'form'} do |f|
+      = render 'form', f: f
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -346,6 +346,10 @@ es:
       header: "Crear nuevo reporte"
     form:
       anonymise: "Ocultar identidad"
+      prompt_service: 'Tipo de servicio'
+      address_placeholder: 'Ej. Av Revolucion 2342, 64830 Monterrey, Nuevo León, México'
+      description_placeholder: 'Favor de detallar su reporte y dar señas sobre la ubicación.'
+      map_help: 'El marcador se posiciona aproximadamente en la dirección proporcionada, en caso de no estar en la posición correcta puedes ubicarlo manualmente.'
     show:
       votes: "Votos"
       share_it: "Compártelo"