diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f3f5c9f..2f1e030 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,8 +1,8 @@ - + - <%= yield :page_title -%>CARTO + <%= yield :page_title -%>快点 <%= favicon_link_tag "favicons/favicon.ico" %> <%= stylesheet_link_tag 'common_new.css', :media => 'all' %> <%= yield :css -%> diff --git a/app/views/layouts/application_builder.html.erb b/app/views/layouts/application_builder.html.erb index 9e5b593..1713add 100644 --- a/app/views/layouts/application_builder.html.erb +++ b/app/views/layouts/application_builder.html.erb @@ -1,9 +1,9 @@ - + - <%= yield :page_title -%>CARTO + <%= yield :page_title -%>快点 <%= favicon_link_tag "favicons/favicon.ico" -%> <%= stylesheet_link_tag 'common_editor3', 'editor3', 'deep_insights_new', :media => 'all' %> <%= csrf_meta_tag -%> diff --git a/app/views/layouts/application_password_layout.html.erb b/app/views/layouts/application_password_layout.html.erb index adc8589..b366d54 100644 --- a/app/views/layouts/application_password_layout.html.erb +++ b/app/views/layouts/application_password_layout.html.erb @@ -3,7 +3,7 @@ - <%= yield :title %> | CARTO + <%= yield :title %> | 快点 <%= favicon_link_tag "favicons/favicon.ico" %> <%= editor_stylesheet_link_tag 'password_protected.css' %> <%= insert_google_tag_manager('embeds') %> diff --git a/app/views/layouts/application_public_visualization_layout.html.erb b/app/views/layouts/application_public_visualization_layout.html.erb index 023016f..086ab5a 100644 --- a/app/views/layouts/application_public_visualization_layout.html.erb +++ b/app/views/layouts/application_public_visualization_layout.html.erb @@ -1,5 +1,5 @@ - + <%= favicon_link_tag "favicons/favicon.ico" %> <%= yield :title %> @@ -10,26 +10,9 @@ - - - <% if Cartodb.get_config(:facebook, 'app_id') %> - - <% end %> - <% if Cartodb.get_config(:facebook, 'admins') %> - - <% end %> - - - - <% unless @twitter_username.nil? %> - - <% end %> - - - <%= yield :css %> <%= insert_google_tag_manager('embeds') %> diff --git a/app/views/layouts/application_table_public.html.erb b/app/views/layouts/application_table_public.html.erb index d8e85e0..361c175 100644 --- a/app/views/layouts/application_table_public.html.erb +++ b/app/views/layouts/application_table_public.html.erb @@ -1,5 +1,5 @@ - + <%= favicon_link_tag "favicons/favicon.ico" %> <%= yield :page_title %> @@ -15,21 +15,6 @@ - <% if Cartodb.get_config(:facebook, 'app_id') %> - - <% end %> - <% if Cartodb.get_config(:facebook, 'admins') %> - - <% end %> - - - - <% unless @twitter_username.nil? %> - - <% end %> - - - <%= yield :css %> <%= insert_google_tag_manager('embeds') %> diff --git a/app/views/layouts/explore.html.erb b/app/views/layouts/explore.html.erb index a261ffd..544277e 100644 --- a/app/views/layouts/explore.html.erb +++ b/app/views/layouts/explore.html.erb @@ -1,10 +1,9 @@ - + <%= favicon_link_tag "favicons/favicon.ico" %> <%= yield :title %> - diff --git a/app/views/layouts/front_layout.html.erb b/app/views/layouts/front_layout.html.erb index 19ed56e..7697c22 100644 --- a/app/views/layouts/front_layout.html.erb +++ b/app/views/layouts/front_layout.html.erb @@ -2,7 +2,7 @@ - + diff --git a/app/views/layouts/frontend.html.erb b/app/views/layouts/frontend.html.erb index 4fc0730..0e6fec5 100644 --- a/app/views/layouts/frontend.html.erb +++ b/app/views/layouts/frontend.html.erb @@ -3,10 +3,9 @@ - <%= "#{yield(:title)} — " if content_for?(:title) %>CARTO + <%= "#{yield(:title)} — " if content_for?(:title) %>快点 "> - <%= yield(:robots) if content_for?(:robots) %> <%= favicon_link_tag "favicons/favicon.ico" %> <%= stylesheet_link_tag "sessions" %> <%= yield :css %> diff --git a/app/views/layouts/mail.html.erb b/app/views/layouts/mail.html.erb index 663719d..883e4b2 100644 --- a/app/views/layouts/mail.html.erb +++ b/app/views/layouts/mail.html.erb @@ -1,4 +1,4 @@ - + <%= @subject %>