diff --git a/.gitignore b/.gitignore index f3810662dc52..4254922f2d79 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ public/assets public/system public/uploads public/javascripts +public/static public/stylesheets public/images public/fonts diff --git a/NEWS.md b/NEWS.md index b78391e968ae..c4275e75e6a4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -97,6 +97,7 @@ ion for time-series (#12670) * Added lockout page to show when a user is locked up due to expiration of the trial (#13100) ### Bug fixes / enhancements +* Fix incorrect "back to dashboard" link in dataset view (#13111) * Improve the discoverability of the table view switch (#13050) * Change Basemap layer style (#13091) * Rename point/polygon count to feature count (#13066) @@ -127,6 +128,7 @@ ion for time-series (#12670) * Improve legends for torque (CartoDB/support#979) * CSV export allowed without geometries (#12888) * Fix handling of imports with long file names and existing tables with almost the same name (#12732) +* Update widgets although source layer is not visible (support/#1135) * Update cartodb.js version * Don't allow csv export for polygon or line (#9855) * Fix a problem with Unifont Medium font (#support/1002, #support/989) diff --git a/app/assets/stylesheets/dashboard/lockout.css.scss b/app/assets/stylesheets/dashboard/lockout.css.scss index 36b7781d80c9..7300409b5f6c 100644 --- a/app/assets/stylesheets/dashboard/lockout.css.scss +++ b/app/assets/stylesheets/dashboard/lockout.css.scss @@ -35,7 +35,8 @@ text-decoration: underline; } -.Lockout .CDB-Button--primary { +.Lockout .CDB-Button--primary, +.Lockout .CDB-Button--secondary { margin-top: 20px; padding-top: 13px; } diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index a79c4aee3ae9..c9551584ea14 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -131,7 +131,7 @@ def delete def lockout if current_user.locked? @expiration_days = @user.remaining_days_deletion - @payments_url = @user.update_payment_url(request.protocol) + @payments_url = @user.plan_url(request.protocol) render locals: { breadcrumb: false } else render_404 diff --git a/app/helpers/account_type_helper.rb b/app/helpers/account_type_helper.rb index eba3d49cedab..4145cfe82b9d 100644 --- a/app/helpers/account_type_helper.rb +++ b/app/helpers/account_type_helper.rb @@ -9,6 +9,10 @@ def plan_name_no_time(account_type) plan_name(account_type).gsub(' - Monthly', '').gsub(' - Annual', '') end + def plan_name_no_trial(account_type) + plan_name(account_type).gsub(' Trial', '') + end + def public_plan_name(account_type) PUBLIC_PLAN_NAME.fetch(account_type) end @@ -17,20 +21,21 @@ def public_plan_name(account_type) PUBLIC_PLAN_NAME = { 'FREE' => 'Free', - 'PERSONAL30' => 'Personal Trial', - 'BASIC' => 'Personal', - 'BASIC LUMP-SUM' => 'Personal Lump-Sum' + 'PERSONAL30' => 'Professional Trial', + 'BASIC' => 'Professional', + 'BASIC LUMP-SUM' => 'Professional Lump-Sum', + 'ENTERPRISE' => 'Enterprise' }.freeze PLAN_NAME_BY_ACCOUNT_TYPE = { 'FREE' => 'Free', - 'PERSONAL30' => 'Personal Trial', - 'BASIC' => 'Personal', - 'BASIC LUMP-SUM' => 'Personal', - 'BASIC ACADEMIC' => 'Personal Non-Profit', - 'BASIC NON-PROFIT' => 'Personal Non-Profit', - 'BASIC LUMP-SUM ACADEMIC' => 'Personal Non-Profit', - 'BASIC LUMP-SUM NON-PROFIT' => 'Personal Non-Profit', + 'PERSONAL30' => 'Professional Trial', + 'BASIC' => 'Professional', + 'BASIC LUMP-SUM' => 'Professional', + 'BASIC ACADEMIC' => 'Professional Non-Profit', + 'BASIC NON-PROFIT' => 'Professional Non-Profit', + 'BASIC LUMP-SUM ACADEMIC' => 'Professional Non-Profit', + 'BASIC LUMP-SUM NON-PROFIT' => 'Professional Non-Profit', 'Enterprise Builder - Annual' => 'Enterprise', 'Enterprise Builder - On-premises - Annual' => 'Enterprise', 'Cloud Engine & Enterprise Builder - Annual' => 'Enterprise', diff --git a/app/views/admin/users/lockout.html.erb b/app/views/admin/users/lockout.html.erb index 83d4b5168bf1..373862ac2994 100644 --- a/app/views/admin/users/lockout.html.erb +++ b/app/views/admin/users/lockout.html.erb @@ -6,15 +6,17 @@

Welcome back,
<%= @user.username %>!

-

Your trial period has expired.

-

Please add a payment method to continue using CARTO.

-

CARTO has Community Programs for qualified applicants.
Learn more about our Grants and Ambassador programs.

+

You've reached the end of your CARTO trial period.

+

By upgrading, you'll be able to continue using CARTO. Our Professional plan is a great fit for occasional use, and our Enterprise plans offer access to the Data Observatory, private sharing, custom connectors, and business-strength data services.

<% if @expiration_days %> -

Your account will be deleted in <%= pluralize(@expiration_days, "day") %> if you do not add a payment method or qualify for a Community Program.

+

Your account and data will be preserved for <%= pluralize(@expiration_days, "day") %>, so that upon upgrade you will regain access to the data and maps.
If you're a student or an ambassador, remember you can also qualify for our Community Program.

<% else %> -

Your account will be deleted in few days if you do not add a payment method or qualify for a Community Program.

+

Your account and data will be preserved for a few days, so that upon upgrade you will regain access to the data and maps.
If you're a student or an ambassador, remember you can also qualify for our Community Program.

<% end %> - + + CONTACT SALES + + ADD PAYMENT METHOD
diff --git a/lib/assets/core/javascripts/cartodb3/dataset/dataset.tpl b/lib/assets/core/javascripts/cartodb3/dataset/dataset.tpl index ac37f108ffa3..8e27bd2aa31e 100644 --- a/lib/assets/core/javascripts/cartodb3/dataset/dataset.tpl +++ b/lib/assets/core/javascripts/cartodb3/dataset/dataset.tpl @@ -1,6 +1,6 @@
-