zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back feature flags where needed

Browse Source
pull/14080/head
rubenmoya 6 years ago
parent 696c86657d
commit 01f4437b86
8 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File

8
app/views/admin/visualizations/public_dataset.html.erb
Unescape View File

@ -7,7 +7,13 @@
<%= content_for(:twitter_card) do %><%= Carto::StaticMapsURLHelper.new.url_for_static_map(request, @table.table_visualization, 560, 300) %><% end %>
<%= content_for(:facebook_card) do %><%= Carto::StaticMapsURLHelper.new.url_for_static_map(request, @table.table_visualization, 1200, 630) %><% end %>
<%= stylesheet_link_tag 'common', 'common_vendor', 'public_table_new', 'public_map' %>
<%= content_for(:css) do %>
<% if @has_new_dashboard %>
<%= stylesheet_link_tag 'common', 'common_vendor', 'public_table_new', 'public_map' %>
<% else %>
<%= stylesheet_link_tag 'cartodb', 'common', 'public_table', 'public_map' %>
<% end %>
<% end %>
<% content_for(:js) do %>
<% if @table.map.provider == 'googlemaps' %>

6
app/views/admin/visualizations/public_map.html.erb
Unescape View File

@ -10,7 +10,11 @@
<%= content_for(:body_class) do %> PublicMap <% end %>
<%= content_for(:css) do %>
<%= stylesheet_link_tag 'common', 'common_vendor', 'public_map' %>
<% if @has_new_dashboard %>
<%= stylesheet_link_tag 'common', 'common_vendor', 'public_map' %>
<% else %>
<%= stylesheet_link_tag 'cartodb', 'common', 'public_map' %>
<% end %>
<% end %>
<%= content_for(:content) do %>

6
app/views/layouts/application.html.erb
Unescape View File

@ -4,7 +4,11 @@
<meta charset='utf-8' />
<title><%= yield :page_title -%>CARTO</title>
<%= favicon_link_tag "/favicons/favicon.ico" -%>
<%= stylesheet_link_tag 'common.css', 'common_vendor.css', :media => 'all' %>
<% if current_user.builder_enabled? %>
<%= stylesheet_link_tag 'cartodb.css', 'common.css', :media => 'all' %>
<% else %>
<%= stylesheet_link_tag 'common_new.css', 'common_new_vendor.css', :media => 'all' %>
<% end %>
<%= yield :css -%>
<%= csrf_meta_tag -%>
<%= insert_google_tag_manager('primary') %>

13
app/views/layouts/public_dashboard.html.erb
Unescape View File

@ -23,7 +23,12 @@
<meta name="twitter:image" content="<%= @avatar_url %>">
<meta name="twitter:url" content="<%= request.original_url %>" />
<%= stylesheet_link_tag 'deep_insights', 'deep_insights_vendor', 'common', 'common_vendor', 'public_dashboard' %>
<% if @has_new_dashboard %>
<%= stylesheet_link_tag 'deep_insights_new', 'deep_insights_new_vendor', 'common_new', 'common_new_vendor', 'public_dashboard_new' %>
<% else %>
<%= stylesheet_link_tag 'cartodb', 'deep_insights', 'common', 'public_dashboard' %>
<% end %>
<%= insert_google_tag_manager('embeds') %>
</head>
<body class="PublicBody PublicBody--grey">
@ -70,7 +75,11 @@
<%= insert_google_maps(@gmaps_query_string) %>
<% end %>
<%= javascript_include_tag 'common_dashboard', 'public_dashboard_vendor', 'public_dashboard' %>
<% if @has_new_dashboard %>
<%= javascript_include_tag 'common_dashboard.js', 'public_dashboard_new_vendor', 'public_dashboard_new' %>
<% else %>
<%= javascript_include_tag 'cdb.js', 'templates', 'public_dashboard_deps', 'public_dashboard' %>
<% end %>
<%= yield :js %>
<%= insert_google_analytics('embeds', true) %>
<%= insert_hubspot() %>

12
app/views/layouts/public_user_feed.html.erb
Unescape View File

@ -15,7 +15,11 @@
<meta property="og:url" content="<%= request.original_url %>" />
<meta property="og:image" content="<%= @avatar_url %>" />
<%= stylesheet_link_tag 'deep_insights', 'deep_insights_vendor','common', 'common_vendor', 'public_dashboard', 'user_feed' %>
<% if @has_new_dashboard %>
<%= stylesheet_link_tag 'deep_insights_new', 'deep_insights_new_vendor','common_new', 'common_new_vendor', 'public_dashboard_new', 'user_feed_new' %>
<% else %>
<%= stylesheet_link_tag 'cartodb', 'deep_insights', 'common', 'public_dashboard' %>
<% end %>
<% if @needs_gmaps_lib %>
<%= insert_google_maps(@gmaps_query_string) %>
@ -65,7 +69,11 @@
};
</script>
<%= javascript_include_tag 'common_dashboard', 'user_feed_vendor', 'user_feed' %>
<% if @has_new_dashboard %>
<%= javascript_include_tag 'common_dashboard', 'user_feed_new_vendor', 'user_feed_new' %>
<% else %>
<%= javascript_include_tag 'cdb.js', 'templates', 'user_feed_deps', 'user_feed' %>
<% end %>
<%= yield :js %>
<%= insert_google_analytics('embeds', true) %>
<%= insert_hubspot() %>

17
config/application.rb
Unescape View File

@ -124,10 +124,10 @@ module CartoDB
explore.js
user_feed_deps.js
user_feed.js
user_feed.js
user_feed_vendor.js
user_feed_new.css
user_feed_new_vendor.css
api_keys_new.js
api_keys_new_vendor.js
public_dashboard.js
@ -159,12 +159,14 @@ module CartoDB
common.js
deep_insights.css
deep_insights_vendor.css
deep_insights_new.css
deep_insights_new_vendor.css
cdb.css
cdb/themes/css/cartodb.css
cdb/themes/css/cartodb.ie.css
common.css
common_vendor.css
common_new.css
common_new_vendor.css
old_common.css
dashboard.css
cartodb.css
@ -183,18 +185,19 @@ module CartoDB
organization.css
password_protected.css
public_dashboard.css
public_dashboard_new.css
public_dashboard_new_vendor.css
public_map.css
public_map_new.css
embed_map.css
data_library.css
public_table.css
public_table_new.css
sessions.css
user_feed.css
explore.css
mobile_apps.css
api_keys.css
api_keys_new.css
public_table_new.css
plugins/tipsy.css

12
lib/build/files/webpack_files.js
Unescape View File

@ -1,8 +1,8 @@
var files = {
dashboard: {
stylesheets: [
'/stylesheets/common.css',
'/stylesheets/common_vendor.css',
'/stylesheets/common_new.css',
'/stylesheets/common_new_vendor.css',
'/stylesheets/dashboard.css',
'/stylesheets/dashboard_vendor.css',
],
@ -14,8 +14,8 @@ var files = {
},
profile: {
stylesheets: [
'/stylesheets/common.css',
'/stylesheets/common_vendor.css',
'/stylesheets/common_new.css',
'/stylesheets/common_new_vendor.css',
],
scripts: [
'/javascripts/common_dashboard.js',
@ -119,8 +119,8 @@ var files = {
// },
account: {
stylesheets: [
'/stylesheets/common.css',
'/stylesheets/common_vendor.css',
'/stylesheets/common_new.css',
'/stylesheets/common_new_vendor.css',
],
scripts: [
'/javascripts/common_dashboard.js',

10
webpack/dashboard/entryPoints.js
Unescape View File

@ -5,19 +5,19 @@ const rootDir = file => resolve(__dirname, '../../', file);
const removeDuplicated = array => Array.from(new Set(array));
module.exports = {
common: removeDuplicated([
common_new: removeDuplicated([
rootDir('assets/stylesheets/common/utilities.scss'),
rootDir('assets/stylesheets/common/icon-font-specials.scss'),
...glob.sync(rootDir('assets/stylesheets/common/**/*.scss')),
rootDir('node_modules/cartoassets/src/scss/entry.scss')
]),
deep_insights: [
deep_insights_new: [
rootDir('assets/stylesheets/deep-insights/entry.scss'),
rootDir('node_modules/internal-carto.js/themes/scss/entry.scss')
],
public_map: glob.sync(rootDir('assets/stylesheets/public_map/**/*.scss')),
public_map_new: glob.sync(rootDir('assets/stylesheets/public_map/**/*.scss')),
dashboard: [
rootDir('lib/assets/javascripts/dashboard/dashboard.js'),
@ -28,14 +28,14 @@ module.exports = {
public_table_new: rootDir('lib/assets/javascripts/dashboard/public-dataset.js'),
public_dashboard: [
public_dashboard_new: [
rootDir('lib/assets/javascripts/dashboard/public-dashboard.js'),
...glob.sync(rootDir('assets/stylesheets/public_dashboard/**/*.scss')),
rootDir('assets/stylesheets/public_map/public_map_buttons.scss'),
rootDir('assets/stylesheets/public_map/public_map_footer.scss')
],
user_feed: [
user_feed_new: [
rootDir('lib/assets/javascripts/dashboard/user-feed.js'),
...glob.sync(rootDir('assets/stylesheets/user_feed/**/*.scss'))
],

Write Preview
Loading…
Cancel
Save