This commit is contained in:
zhongjin 2024-04-07 15:34:49 +08:00
parent 0dd84280d6
commit 2c69974dcf
13 changed files with 19 additions and 64 deletions

View File

@ -1,8 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<meta charset='utf-8' /> <meta charset='utf-8' />
<title><%= yield :page_title -%>CARTO</title> <title><%= yield :page_title -%>快点</title>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<%= stylesheet_link_tag 'common_new.css', :media => 'all' %> <%= stylesheet_link_tag 'common_new.css', :media => 'all' %>
<%= yield :css -%> <%= yield :css -%>

View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<meta charset='utf-8' /> <meta charset='utf-8' />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title><%= yield :page_title -%>CARTO</title> <title><%= yield :page_title -%>快点</title>
<%= favicon_link_tag "favicons/favicon.ico" -%> <%= favicon_link_tag "favicons/favicon.ico" -%>
<%= stylesheet_link_tag 'common_editor3', 'editor3', 'deep_insights_new', :media => 'all' %> <%= stylesheet_link_tag 'common_editor3', 'editor3', 'deep_insights_new', :media => 'all' %>
<%= csrf_meta_tag -%> <%= csrf_meta_tag -%>

View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<title><%= yield :title %> | CARTO</title> <title><%= yield :title %> | 快点</title>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<%= editor_stylesheet_link_tag 'password_protected.css' %> <%= editor_stylesheet_link_tag 'password_protected.css' %>
<%= insert_google_tag_manager('embeds') %> <%= insert_google_tag_manager('embeds') %>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh">
<head> <head>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<title><%= yield :title %></title> <title><%= yield :title %></title>
@ -10,26 +10,9 @@
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<meta property="og:title" content="<%= yield :title %>" /> <meta property="og:title" content="<%= yield :title %>" />
<meta property="og:site_name" content="CARTO" />
<meta property="og:description" content="<%= yield :description %>" /> <meta property="og:description" content="<%= yield :description %>" />
<meta property="og:type" content="article" /> <meta property="og:type" content="article" />
<meta property="og:url" content="<%= request.original_url %>" /> <meta property="og:url" content="<%= request.original_url %>" />
<meta property="og:image" content="<%= yield :facebook_card %>">
<% if Cartodb.get_config(:facebook, 'app_id') %>
<meta property="fb:app_id" content="<%= Cartodb.get_config(:facebook, 'app_id') %>" />
<% end %>
<% if Cartodb.get_config(:facebook, 'admins') %>
<meta property="fb:admins" content="<%= Cartodb.get_config(:facebook, 'admins') %>" />
<% end %>
<meta property="article:publisher" content="https://www.facebook.com/cartodb" />
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@CARTO">
<% unless @twitter_username.nil? %>
<meta name="twitter:creator" "@#{@twitter_username}">
<% end %>
<meta name="twitter:title" content="<%= yield :title %>">
<meta name="twitter:description" content="<%= yield :description %>">
<meta name="twitter:image" content="<%= yield :twitter_card %>">
<%= yield :css %> <%= yield :css %>
<%= insert_google_tag_manager('embeds') %> <%= insert_google_tag_manager('embeds') %>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh">
<head> <head>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<title><%= yield :page_title %></title> <title><%= yield :page_title %></title>
@ -15,21 +15,6 @@
<meta property="og:type" content="article" /> <meta property="og:type" content="article" />
<meta property="og:url" content="<%= request.original_url %>" /> <meta property="og:url" content="<%= request.original_url %>" />
<meta property="og:image" content="<%= yield :facebook_card %>"> <meta property="og:image" content="<%= yield :facebook_card %>">
<% if Cartodb.get_config(:facebook, 'app_id') %>
<meta property="fb:app_id" content="<%= Cartodb.get_config(:facebook, 'app_id') %>" />
<% end %>
<% if Cartodb.get_config(:facebook, 'admins') %>
<meta property="fb:admins" content="<%= Cartodb.get_config(:facebook, 'admins') %>" />
<% end %>
<meta property="article:publisher" content="https://www.facebook.com/cartodb" />
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@CARTO">
<% unless @twitter_username.nil? %>
<meta name="twitter:creator" "@#{@twitter_username}" ">
<% end %>
<meta name="twitter:title" content="<%= yield :page_title %>">
<meta name="twitter:description" content="<%= yield :description %>">
<meta name="twitter:image" content="<%= yield :twitter_card %>">
<%= yield :css %> <%= yield :css %>
<%= insert_google_tag_manager('embeds') %> <%= insert_google_tag_manager('embeds') %>

View File

@ -1,10 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh">
<head> <head>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<title><%= yield :title %></title> <title><%= yield :title %></title>
<meta name="description" content="<%= yield :description %>"> <meta name="description" content="<%= yield :description %>">
<meta name="keywords" content="carto, maps, data visualization tools, big data, location intelligence, deep insights, datasets">
<meta name="author" content="<%= @name %>"> <meta name="author" content="<%= @name %>">
<meta charset='utf-8' /> <meta charset='utf-8' />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />

View File

@ -2,7 +2,7 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]--> <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]--> <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js" lang="zh"> <!--<![endif]-->
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">

View File

@ -3,10 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title><%= "#{yield(:title)} — " if content_for?(:title) %>CARTO</title> <title><%= "#{yield(:title)} — " if content_for?(:title) %>快点</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="<%= content_for?(:title) ? yield(:title) : "Create dynamic maps, analyze and build location-aware and geospatial applications with your data using the power of PostGIS in the cloud." %>"> <meta name="description" content="<%= content_for?(:title) ? yield(:title) : "Create dynamic maps, analyze and build location-aware and geospatial applications with your data using the power of PostGIS in the cloud." %>">
<%= yield(:robots) if content_for?(:robots) %>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<%= stylesheet_link_tag "sessions" %> <%= stylesheet_link_tag "sessions" %>
<%= yield :css %> <%= yield :css %>

View File

@ -1,4 +1,4 @@
<html lang="en"> <html lang="zh">
<head> <head>
<title><%= @subject %></title> <title><%= @subject %></title>
<!-- <!--

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<title><%= yield :title %></title> <title><%= yield :title %></title>
@ -15,13 +15,6 @@
<meta property="og:url" content="<%= request.original_url %>" /> <meta property="og:url" content="<%= request.original_url %>" />
<meta property="og:image" content="<%= @avatar_url %>" /> <meta property="og:image" content="<%= @avatar_url %>" />
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@CARTO">
<meta name="twitter:creator" content="@CARTO">
<meta name="twitter:title" content="<%= yield :title %>">
<meta name="twitter:description" content="<%= yield :description %>">
<meta name="twitter:image" content="<%= @avatar_url %>">
<meta name="twitter:url" content="<%= request.original_url %>" />
<% if @has_new_dashboard %> <% if @has_new_dashboard %>
<%= stylesheet_link_tag 'deep_insights_new', 'common_new', 'public_dashboard_new' %> <%= stylesheet_link_tag 'deep_insights_new', 'common_new', 'public_dashboard_new' %>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<%= favicon_link_tag "favicons/favicon.ico" %> <%= favicon_link_tag "favicons/favicon.ico" %>
<title><%= yield :title %></title> <title><%= yield :title %></title>

View File

@ -1,9 +1,5 @@
<% if @organization %> <% if @organization %>
<% content_for :title do %><%= @organization.name %><% end %> <% content_for :title do %><%= @organization.name %><% end %>
<% content_for :robots do %>
<meta name="robots" content="noindex">
<% end %>
<% end %> <% end %>
<% content_for :js do %> <% content_for :js do %>
@ -31,7 +27,7 @@
<% if @organization.nil? || @organization.auth_username_password_enabled %> <% if @organization.nil? || @organization.auth_username_password_enabled %>
<div class="Sessions-field"> <div class="Sessions-field">
<%= text_field_tag :email, CartoDB.extract_subdomain(request), :title => "Email or username", placeholder: "email or username", class: "CDB-Size-medium #{@organization.present? ? 'Sessions-input' : 'Sessions-navy-input'} topBorderRadius", autofocus: true %> <%= text_field_tag :email, CartoDB.extract_subdomain(request), :title => "Email or username", placeholder: "邮件地址或用户名", class: "CDB-Size-medium #{@organization.present? ? 'Sessions-input' : 'Sessions-navy-input'} topBorderRadius", autofocus: true %>
<% if @login_error %> <% if @login_error %>
<div class="Sessions-fieldError js-Sessions-fieldError" data-content="<%= @login_error %>">!</div> <div class="Sessions-fieldError js-Sessions-fieldError" data-content="<%= @login_error %>">!</div>
@ -39,21 +35,21 @@
</div> </div>
<div class="Sessions-field"> <div class="Sessions-field">
<%= password_field_tag :password, "", autocomplete: "off", placeholder: "password", class: "CDB-Size-medium #{@organization.present? ? 'Sessions-input' : 'Sessions-navy-input'} bottomBorderRadius" %> <%= password_field_tag :password, "", placeholder: "密码", class: "CDB-Size-medium #{@organization.present? ? 'Sessions-input' : 'Sessions-navy-input'} bottomBorderRadius" %>
<% if @login_error %> <% if @login_error %>
<div class="Sessions-fieldError js-Sessions-fieldError" data-content="<%= @login_error %>">!</div> <div class="Sessions-fieldError js-Sessions-fieldError" data-content="<%= @login_error %>">!</div>
<% end %> <% end %>
<div class="Sessions-inputLinkAside"> <div class="Sessions-inputLinkAside">
<%= link_to 'Forgot?', forget_password_url(organization_name: @organization.try(:name)) %> <%= link_to '忘记密码?', forget_password_url(organization_name: @organization.try(:name)) %>
</div> </div>
</div> </div>
<div class="Sessions-field"> <div class="Sessions-field">
<p> <p>
<button type="submit" class="Sessions-submitButton js-Sessions-button js-Loading"> <button type="submit" class="Sessions-submitButton js-Sessions-button js-Loading">
<span class="js-Loading-text">Log in</span> <span class="js-Loading-text">登录</span>
<%= render :partial => 'shared/loading_animation' %> <%= render :partial => 'shared/loading_animation' %>
</button> </button>
</p> </p>

View File

@ -24,7 +24,7 @@
<% if @maps_count > 0 %> <% if @maps_count > 0 %>
<%= pluralize(@maps_count, "Map") %> <%= pluralize(@maps_count, "Map") %>
<% else %> <% else %>
Maps 地图
<% end %> <% end %>
</a> </a>
</li> </li>
@ -33,7 +33,7 @@
<% if @tables_num > 0 %> <% if @tables_num > 0 %>
<%= pluralize(@tables_num, "Dataset") %> <%= pluralize(@tables_num, "Dataset") %>
<% else %> <% else %>
Datasets 数据
<% end %> <% end %>
</a> </a>
</li> </li>