Merge branch 'master' into master

config.toml

@@ -1,10 +1,18 @@
-baseurl = "https://actix.rs"
 title = "actix"
-languageCode = "en-us"
 canonifyURLs = true
 googleAnalytics = "UA-110322332-1"
 pygmentsUseClasses = true
 pygmentsCodeFences = true
+defaultContentLanguageInSubdir = false
+enableRobotsTXT = true
+enableMissingTranslationPlaceholders = true
+DefaultContentLanguage = "en"
+baseURL = "https://actix.rs"
+
+[languages.en]
+  languageCode = "en-US"
+  languageName = "English"
+  weight = 1
 
 [params]
 actixVersion = "0.5"

content/docs/extractors.md

@@ -184,7 +184,7 @@ When you register a handler using `Route::with()`, it returns a configuration in
 a *Json* extractor it returns a *JsonConfig*. You can configure the maximum size of the json
 payload as well as a custom error handler function.
 
-The following example limits the size of the payload to 4kb and uses a custom error hander.
+The following example limits the size of the payload to 4kb and uses a custom error handler.
 
 ```rust
 #[macro_use] extern crate serde_derive;

content/docs/server.md

@@ -15,7 +15,7 @@ application factory must have `Send` + `Sync` boundaries. More about that in the
 
 To bind to a specific socket address,
 [`bind()`](../../actix-web/actix_web/server/struct.HttpServer.html#method.bind)
-must be used, and it may be called multiple times. To bind ssl socket
+must be used, and it may be called multiple times. To bind ssl socket,
 [`bind_ssl()`](../../actix-web/actix_web/server/struct.HttpServer.html#method.bind_ssl)
 or [`bind_tls()`](../../actix-web/actix_web/server/struct.HttpServer.html#method.bind_tls)
 should be used. To start the http server, one of the start methods.

i18n/en.toml

@@ -0,0 +1,8 @@
+[home]
+other = "Home"
+[docs]
+other = "Documentation"
+[community]
+other = "Community"
+[code]
+other = "Code"

layouts/index.html

@@ -1,13 +1,14 @@
 {{ partial "header" . }}
 
-<div class="jumbotron">
+<div id="act-home">
+  <div class="jumbotron">
     <div class="actix-jumbotron">
       <img src="/img/logo-large.png" class="align-middle actix-logo" alt="">
       <p class="lead">rust's powerful actor system and most fun web framework</p>
     </div>
-</div>
+  </div>
 
-<div class="container actix-home">
+  <div class="container actix-home">
     <div class="row">
       <div class="col-md-4">
         <div class="actix-features">
@@ -35,7 +36,6 @@
         </h2>
         <p>Actix is blazingly fast. Don't take our word for it -- <a href="https://www.techempower.com/benchmarks/#section=data-r16&hw=ph&test=plaintext">see for yourself!</a></p>
       </div>
-    </div>
       <div class="col-md-8">
         <div class="actix-content">
           {{ highlight `extern crate actix_web;
@@ -151,6 +151,7 @@ fn main() {
         </ul>
       </div>
     </div>
+  </div>
 </div>
 
 {{ partial "footer" . }}

layouts/partials/header.html

@@ -28,19 +28,28 @@
         <div class="navbar-collapse collapse" id="actix-main-nav">
           <ul class="nav navbar-nav">
             <li class="nav-item hd-lg-down">
-              <a class="navbar-brand" href="/"><img src="/img/logo-nav.png" class="align-middle" alt=""></a>
+              <a class="navbar-brand" href="{{ "/" | absLangURL }}"><img src="/img/logo-nav.png" class="align-middle" alt=""></a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/">Home</a>
+              <a class="nav-link" href="{{ "/" | absLangURL }}">{{ T "home" }}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/docs/">Documentation</a>
+              <a class="nav-link" href="{{ "/docs/" | absLangURL }}">{{ T "docs" }}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/community/">Community</a>
+              <a class="nav-link" href="{{ "/community/" | absLangURL }}">{{ T "community" }}</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/code/">Code</a>
+              <a class="nav-link" href="{{ "/code/" | absLangURL }}">{{ T "code" }}</a>
+            </li>
+            <li class="nav-item language-selector">
+              <i class="fa fa-fw fa-globe" aria-hidden="false"></i>
+              <ul class="subitem">
+              {{ range $.Site.Home.AllTranslations }}
+                <li class="submenu-item"><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
+              {{ end }}
+              <li ><a href="https://actix-cn.github.io/">中文</a></li>
+              </ul>
             </li>
           </ul>
         </div>

static/css/actix.css

@@ -169,17 +169,47 @@ img {
   line-height: 60px;
   height: 60px;
   padding-top: 0;
+  list-style: none;
+}
+
+.navbar-nav .language-selector {
+  position: relative;
+}
+
+.navbar-nav .language-selector ul.subitem {
+  display: none;
+  position: absolute;
+  right: 0;
+}
+
+.navbar-nav .language-selector:hover .subitem {
+  margin: 0;
+  padding: 0;
+  display: block;
+  background-color: #dcfaf7;
+}
+
+.navbar-nav .language-selector ul li {
+  padding: 0;
+  margin: 0;
+  height: auto;
+  line-height: 1;
+}
+
+.navbar-nav .language-selector ul li a {
+  display: block;
+  padding: 1em;
 }
 
 .doctoggle {
   margin: -1rem 0 2rem 0;
   display: none;
-  }
+}
   
-  .leftnav {
+.leftnav {
   margin: 0 -1rem;
   padding: 0 1rem;
-  }
+}
 
 .leftnav li {
   margin: 1rem 0rem;
@@ -373,6 +403,7 @@ img {
     text-decoration: none;
   }
 
+  
 /*
  *
  * ===== Footer =====
@@ -560,7 +591,13 @@ h5:hover a {
   .actix-footer-social a .fa-github {
     margin-right: 1rem;
   }
+  .navbar-nav .language-selector:hover .subitem {
+    margin: 0 -2rem 0 -1rem;
+    display: block;
+    background-color: #e8f9fc;
+  }
 }
+
 @media (min-width: 480px) and (max-width: 576px) {
   header .nav {
     width: 100%;
@@ -600,3 +637,33 @@ h5:hover a {
     width: 88%;
   }
 }
+
+
+#act-cn-tabs {
+  padding: 2rem 2rem 1rem 2rem;
+  margin: 2rem auto;
+  background:#dceaea;
+}
+.act-menu li{
+  text-align:center;
+  line-height:44px;
+  font-size:15px;
+  overflow:hidden;
+}
+.act-menu li.off{
+  padding: 0 1.5rem;
+  background:#FFFFFF;
+  color:#589c9e;
+  font-weight:bold;
+}
+
+@media (min-width: 768px) {
+  #act-cn-tabs {
+    display: flex;
+    flex-flow: row;
+    padding: 2rem 1rem 1rem 2rem;
+  }
+  #act-cn-tabs #content {
+      width: 77%;
+  }
+}

static/js/actix.js

@@ -36,3 +36,4 @@
     initFeatureSelector();
   });
 })();
+