From 4fac8efad4115fee60c25274c1f90c43e5b36222 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Mon, 16 Dec 2019 13:31:22 +0100
Subject: [PATCH 1/2] Add feedback form link

---
 .../common/create/listing/imports_options.scss        |  7 +++++--
 .../imports/import-bigquery/import-bigquery-form.tpl  | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assets/stylesheets/common/create/listing/imports_options.scss b/assets/stylesheets/common/create/listing/imports_options.scss
index 1db5f0d180..530faf87d8 100644
--- a/assets/stylesheets/common/create/listing/imports_options.scss
+++ b/assets/stylesheets/common/create/listing/imports_options.scss
@@ -71,8 +71,6 @@ $w: $sLayout-width;
   }
 
   &__label {
-    width: 160px !important;
-
     &--textarea {
       padding-top: 12px;
     }
@@ -110,6 +108,11 @@ $w: $sLayout-width;
   &__hint {
     width: 460px;
   }
+
+  &__feedback {
+    padding-top: 75px;
+    text-align: center;
+  }
 }
 
 .is-disabled .ImportOptions__overlay {
diff --git a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
index 78b08e8454..c830a44512 100644
--- a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
@@ -1,6 +1,6 @@
 <form class="Form js-form">
   <div class="Form-row u-alignCenter">
-    <div class="Form-rowLabel ImportOptions__label">
+    <div class="Form-rowLabel">
       <label class="Form-label CDB-Text CDB-Size-medium u-mainTextColor"><%- _t('components.modals.add-layer.imports.bigquery.field-project-billing') %></label>
     </div>
     <div class="">
@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="Form-row u-flex__align--start">
-    <div class="Form-rowLabel ImportOptions__label ImportOptions__label--textarea">
+    <div class="Form-rowLabel ImportOptions__label--textarea">
       <label class="Form-label CDB-Text CDB-Size-medium u-mainTextColor"><%- _t('components.modals.add-layer.imports.bigquery.field-sql-query') %></label>
     </div>
     <div>
@@ -19,11 +19,16 @@
     </div>
   </div>
   <div class="Form-row">
-    <div class="Form-rowLabel ImportOptions__label ImportOptions__label--textarea"></div>
+    <div class="Form-rowLabel ImportOptions__label--textarea"></div>
     <div class="Form-row ImportOptions__input--long u-flex__justify--end">
       <button type="submit" class="CDB-Button CDB-Button--primary is-disabled js-submit">
         <span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-small u-upperCase"><%- _t('components.modals.add-layer.imports.bigquery.run') %></span>
       </button>
     </div>
   </div>
+  <div class="ImportOptions__feedback">
+    <p class="CDB-Text CDB-Size-medium">
+      <span class="u-secondaryTextColor">Have feedback or questions about the BigQuery connector? <a href="https://docs.google.com/forms/d/e/1FAIpQLSf9U6Yca37TlpguW_mC6nr9YdyBJzipCjf_QSHNkqlmkQ8dgQ/viewform" target="_blank">Please let us know!</a></span>
+    </p>
+  </div>
 </form>

From 592f3a241517901f5eca5c882a98602ae40527a8 Mon Sep 17 00:00:00 2001
From: alejandraarri <alejandraarri@carto.com>
Date: Mon, 16 Dec 2019 16:10:31 +0100
Subject: [PATCH 2/2] Add copies into locales file

---
 .../content/imports/import-bigquery/import-bigquery-form.tpl  | 2 +-
 lib/assets/javascripts/locale/en.json                         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
index c830a44512..bbce5c2fd5 100644
--- a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
+++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/import-bigquery/import-bigquery-form.tpl
@@ -28,7 +28,7 @@
   </div>
   <div class="ImportOptions__feedback">
     <p class="CDB-Text CDB-Size-medium">
-      <span class="u-secondaryTextColor">Have feedback or questions about the BigQuery connector? <a href="https://docs.google.com/forms/d/e/1FAIpQLSf9U6Yca37TlpguW_mC6nr9YdyBJzipCjf_QSHNkqlmkQ8dgQ/viewform" target="_blank">Please let us know!</a></span>
+      <span class="u-secondaryTextColor"><%- _t('components.modals.add-layer.imports.bigquery.feedback-text') %> <a href="https://docs.google.com/forms/d/e/1FAIpQLSf9U6Yca37TlpguW_mC6nr9YdyBJzipCjf_QSHNkqlmkQ8dgQ/viewform" target="_blank"><%- _t('components.modals.add-layer.imports.bigquery.feedback-link') %></a></span>
     </p>
   </div>
 </form>
diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json
index 4b5c7dc4dc..d9e0985897 100644
--- a/lib/assets/javascripts/locale/en.json
+++ b/lib/assets/javascripts/locale/en.json
@@ -1357,7 +1357,9 @@
                         "field-sql-query": "SQL query",
                         "hint": "If your query contains geographic data in EPSG:4326 format, name that column “the_geom” so that it’s imported correctly.",
                         "run": "Run SQL query",
-                        "placeholder": "SELECT *, ST_GeogPoint(longitude, latitude) AS the_geom FROM mytable"
+                        "placeholder": "SELECT *, ST_GeogPoint(longitude, latitude) AS the_geom FROM mytable",
+                        "feedback-text": "Have feedback or questions about the BigQuery connector?",
+                        "feedback-link": "Please let us know!"
                     },
                     "notenabled": {
                         "fallback-desc": "This connector is not currently enabled in your account. Please, contact us if you are interested.",