Merge pull request #15746 from CartoDB/1594739480-update-attribution-…

…carto Replace reference to carto.com/attributions by carto.com/about-carto/
CartoDB · Jul 15, 2020 · 70c7ee6 · 70c7ee6
2 parents a7a8209 + 6288c69
commit 70c7ee6
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 53 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -24,6 +24,7 @@ Development
 - Improve query builder performance ([#15725](https://github.com/CartoDB/cartodb/pull/15725))
 - Upgrade rails to 4.2.11.3 ([#15737](https://github.com/CartoDB/cartodb/pull/15737)) 
 - Avoid duplicates on data library loading ([#15720](https://github.com/CartoDB/cartodb/pull/15720))
+- Fixes CARTO attributions link
 
 4.38.0 (2020-06-05)
 -------------------

diff --git a/app/views/admin/shared/_public_footer.html.erb b/app/views/admin/shared/_public_footer.html.erb
@@ -233,7 +233,7 @@
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/jobs/">Jobs</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/press/">Press</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/partners/">Partners</a></dd>
-              <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/attributions/">Attributions</a></dd>
+              <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/about-carto/">Attributions</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/contributions/">Contributions</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/request-live-demo/">Request a Live Demo</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/legal/">Legal</a></dd>

diff --git a/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb b/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb
@@ -112,7 +112,7 @@
     opt.mobile_layout = true;
 
     cartodb.config.set({
-      cartodb_attributions: "CARTO <a href='https://carto.com/attributions?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Attributions&utm_term=<%= @visualization.user.username %>' target='_blank' rel='noopener noreferrer'>attribution</a>",
+      cartodb_attributions: "CARTO <a href='https://carto.com/about-carto/?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Attributions&utm_term=<%= @visualization.user.username %>' target='_blank' rel='noopener noreferrer'>attribution</a>",
       cartodb_logo_link: "https://carto.com?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Logo"
     })
 

diff --git a/config/app_config.yml.sample b/config/app_config.yml.sample
@@ -461,7 +461,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager'
         className: 'voyager_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}@2x.png'
@@ -473,7 +473,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron'
         className: 'positron_rainbow_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png'
@@ -485,7 +485,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter'
         className: 'dark_matter_rainbow_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}@2x.png'
@@ -497,7 +497,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager (labels below)'
         className: 'voyager'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       positron_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png'
@@ -506,7 +506,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron (labels below)'
         className: 'positron_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       dark_matter_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png'
@@ -515,7 +515,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter (labels below)'
         className: 'dark_matter_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       voyager_lite:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png'
@@ -524,7 +524,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager (lite)'
         className: 'voyager_lite'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       positron_lite_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png'
@@ -533,7 +533,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron (lite)'
         className: 'positron_lite_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       dark_matter_lite_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png'
@@ -542,7 +542,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter (lite)'
         className: 'dark_matter_lite_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       eco_cartodb:
         urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png'
         subdomains: 'abcd'

diff --git a/config/app_config.yml.sample.py2 b/config/app_config.yml.sample.py2
@@ -460,7 +460,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager'
         className: 'voyager_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}@2x.png'
@@ -472,7 +472,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron'
         className: 'positron_rainbow_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png'
@@ -484,7 +484,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter'
         className: 'dark_matter_rainbow_labels'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         labels:
           urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
           urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}@2x.png'
@@ -496,7 +496,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager (labels below)'
         className: 'voyager'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       positron_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png'
@@ -505,7 +505,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron (labels below)'
         className: 'positron_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       dark_matter_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png'
@@ -514,7 +514,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter (labels below)'
         className: 'dark_matter_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       voyager_lite:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png'
@@ -523,7 +523,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Voyager (lite)'
         className: 'voyager_lite'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       positron_lite_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png'
@@ -532,7 +532,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Positron (lite)'
         className: 'positron_lite_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       dark_matter_lite_rainbow:
         urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
         urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png'
@@ -541,7 +541,7 @@ defaults: &defaults
         maxZoom: '18'
         name: 'Dark matter (lite)'
         className: 'dark_matter_lite_rainbow'
-        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+        attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
       eco_cartodb:
         urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png'
         subdomains: 'abcd'

diff --git a/doc/manual/source/configuration.rst b/doc/manual/source/configuration.rst
@@ -36,23 +36,23 @@ Here is an example config.yml:
           maxZoom: '18'
           name: 'Positron'
           className: 'positron_rainbow'
-          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/attributions/">CARTO</a>'
+          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/about-carto/">CARTO</a>'
         dark_matter_rainbow:
           url: 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
           subdomains: 'abcd'
           minZoom: '0'
           maxZoom: '18'
           name: 'Dark matter'
           className: 'dark_matter_rainbow'
-          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
         positron_lite_rainbow:
           url: 'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
           subdomains: 'abcd'
           minZoom: '0'
           maxZoom: '18'
           name: 'Positron (lite)'
           className: 'positron_lite_rainbow'
-          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
+          attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
 
       stamen:
         toner_stamen:
@@ -79,7 +79,7 @@ you should add the labels key to the basemap config, as follows:
     maxZoom: '18'
     name: 'Positron'
     className: 'positron_rainbow'
-    attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/attributions/">CARTO</a>'
+    attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/about-carto/">CARTO</a>'
     labels:
       url: 'http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
 

diff --git a/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs b/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs
@@ -230,7 +230,7 @@
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/jobs/">Jobs</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/press/">Press</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/partners/">Partners</a></dd>
-              <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/attributions/">Attributions</a></dd>
+              <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/about-carto/">Attributions</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/contributing/">Contributions</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/request-live-demo/">Request a Live Demo</a></dd>
               <dd class="Footer-item"><a class="Footer-link" href="https://carto.com/legal/">Legal</a></dd>