diff --git a/doc/www-data.in/_config b/doc/www-data.in/_config
index 1c07a1bfcca2fb91375740a938d226fbf8b08158..3c4029598bbfe4db0964692c482566e4b47b0855 100644
--- a/doc/www-data.in/_config
+++ b/doc/www-data.in/_config
@@ -3,6 +3,13 @@ languages:
en: { source-encoding: 'utf-8', output-encoding: 'utf-8', suffix: '.html' }
ru: { source-encoding: 'utf-8', output-encoding: 'utf-8', suffix: '.ru.html' }
-# aux table to implement language switch in header
+# i18n for small bits
+home_tag: { en: 'Home', ru: 'Ðачало' }
+
+# implement language switch in the header, note the reversed language tags
lang_tag: { en: 'РуÑÑкий', ru: 'English' }
lang_ext: { en: '.ru.html', ru: '.html' }
+
+# Download links:
+current_download: http://tarantool.org/dist/tarantool-1.4.3-76-gf2b7d20-src.tar.gz
+more_downloads: http://tarantool.org/dist
diff --git a/doc/www-data.in/_extras/style.css b/doc/www-data.in/_extras/style.css
index 1f9464a124a50db9fb2f346a5dc077b4db139634..d2cc621492b063b914360900addf24654f918978 100644
--- a/doc/www-data.in/_extras/style.css
+++ b/doc/www-data.in/_extras/style.css
@@ -195,14 +195,25 @@ table {
* body > #wrapper > #header #content #footer
*/
-#wrapper, #header, #footer, #content {
+#wrapper {
+ width: 970px;
+ margin: 0 auto;
+ padding: 0;
+}
+
+#header, #footer, #content {
width: 970px;
margin: 0 auto;
padding: 0;
overflow: hidden;
}
+#header {
+ border-bottom: 1px dotted #3f3f3f;
+}
+
#footer {
+ border-top: 1px dotted #3f3f3f;
clear: both;
}
@@ -292,55 +303,63 @@ table {
Custom styles
========================================================================== */
+html, body, #wrapper {
+ height: 100%;
+}
+
body {
- color: #333;
background-color: #eee;
font-size: 80%;
- font-family: Helvetica, Arial, sans-serif;
- line-height: 1.4;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ line-height: 1.5;
}
-#header, #footer, #content {
+#wrapper, #header, #content, #footer {
background-color: #fff;
}
+#content {
+ padding-bottom: 20px;
+}
+
+a { color: #201e9e; }
+a:visited { color: #3f3f3f; }
+
#footer img {
vertical-align: middle;
}
#logo {
- width: 150px;
- height: 30px;
- float: left;
- display: block;
- background: url(tarantool.png) no-repeat;
- margin: 3px 30px 0 30px;
-}
-
-#content {
-
+ width: 170px;
+ height: 170px;
+ float: left;
}
#blurb {
margin-top: 9px;
- background: #ddf;
+ background: #6361f2;
}
-/*
-#blocks {
- background: yellow;
+#blurb h1 {
+ font-size: 3em;
+ line-height: 1;
+}
+
+#blurb h2 {
+ font-size: 1.5em;
+ line-height: 1;
}
-*/
.front_block {
- border: 1px dotted black;
+ /*border: 1px dotted black;*/
margin-top: 10px;
margin-bottom: 10px;
padding: 0 10px;
- background: #eee;
}
#download p {
+ border-top: 1px dotted black;
+ padding-top: 10px;
text-align: center;
}
@@ -348,13 +367,13 @@ body {
font-size: 150%;
border: 2px outset grey;
padding: 4px 10px;
- background: #e50;
+ background: #ff6817;
}
-#download #current a {
+#download a {
text-decoration: none;
}
-#download #current a:visited {
+#download a:visited {
text-decoration: none;
}
@@ -363,12 +382,12 @@ body {
========================================================================== */
#nav {
- width: 740px;
- float: right;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- background: url('bg_header.png') repeat-x scroll 50% 0 white;
+ width: 740px;
+ float: right;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: url('bg_header.png') repeat-x scroll 50% 0 white;
}
#nav ul, #nav ol {
diff --git a/doc/www-data.in/_layout/base b/doc/www-data.in/_layout/base
index 3f3d641761a0cd6e2716441289c5711c2604d767..95ff5b3e82c0fd25f901f7cfba1d337ff774ffa0 100644
--- a/doc/www-data.in/_layout/base
+++ b/doc/www-data.in/_layout/base
@@ -12,7 +12,7 @@
<div id="header">
{% block header %}
- <p class='lwrap'><a id="home_link" href="index.html">Home</a></p>
+ <p class='lwrap'><a id="home_link" href="index{{ languages[pagelang].suffix | e }}">{{ home_tag | langselect | e }}</a></p>
<p class='rwrap'><a id="lang_link" href="{{ pagename + lang_ext | langselect | e }}">{{ lang_tag | langselect | e }}</a></p>
{% endblock header %}
</div>
@@ -21,12 +21,12 @@
{% block content %}
<div class="grid">
<div id="main" class="span_8">
- {% block prologue %}{% endblock %}
- {{ content }}
- {% block epilogue %}{% endblock %}
+ {% block prologue %}{% endblock %}
+ {{ content }}
+ {% block epilogue %}{% endblock %}
</div>
<div id="sidebar" class="span_4">
- {{ sidebar | langselect }}
+ {{ sidebar | langselect }}
</div>
</div>
{% endblock content %}
diff --git a/doc/www-data.in/_layout/docs b/doc/www-data.in/_layout/docs
index 94aa259887e75e2778a1e9e3b5f37db9b9152722..37c5371c207dd3a659a5db88bf75be8d016f4d2c 100644
--- a/doc/www-data.in/_layout/docs
+++ b/doc/www-data.in/_layout/docs
@@ -1,6 +1,2 @@
{% extends "base" %}
{% set title = "Tarantool Docs" %}
-
-{% block epilogue %}
- {{ home_page_docs | langselect }}
-{% endblock epilogue %}
diff --git a/doc/www-data.in/_layout/home b/doc/www-data.in/_layout/home
index 1df434db90b03025e6f65d95b0a07d886327c76b..435923740df42cbd4ba726d87e5ce181a58b1474 100644
--- a/doc/www-data.in/_layout/home
+++ b/doc/www-data.in/_layout/home
@@ -7,29 +7,35 @@
<div class="lwrap">
<div id="blurb" class="span_8">
- <div class="lwrap">
- <img src="logo.png" alt="Tarantool" width="170" height="170"/>
- </div>
- <span id="text">
- <h1>Tarantool<h1>
- <h2>High performance in-memory key-value storage</h2>
- </span>
+
+ <img id="logo" src="logo.png" alt="Tarantool Logo" />
+
+ {{ blurb | langselect }}
+
<div class="clear"></div>
+
+ <div id="download" class="front_block">
+ <p>
+ <a id="current" href="{{ current_download | e }}">Download</a>
+ <a href="{{ more_downloads | e }}">[ More Downloads ]</a>
+ </p>
+ </div>
+
</div>
<div id="blocks">
<div id="docs" class="span_4">
- <div class='front_block'>
- {{ home_page_docs | langselect }}
+ <div class='front_block'>
+ {{ home_page_docs | langselect }}
</div>
- </div>
+ </div>
<div id="join" class="span_4">
- <div class='front_block'>
- {{ home_page_community | langselect }}
+ <div class='front_block'>
+ {{ home_page_community | langselect }}
</div>
- </div>
+ </div>
<div class="clear"></div>
@@ -38,16 +44,9 @@
</div>
<div class="span_4">
-
- <div id="download" class="front_block">
- <p><a id="current" href="http:/tarantool.org/dist">Download</a><p>
- <p><a href="http:/tarantool.org/dist">[ More Downloads ]</a></p>
+ <div id="news" class='front_block'>
+ {{ home_page_news | langselect }}
</div>
-
- <div id="news" class='front_block'>
- {{ home_page_news | langselect }}
- </div>
-
</div>
<div class="clear"></div>
diff --git a/doc/www-data.in/index b/doc/www-data.in/index
index f47970297330d64ff490a0a4aca0a73db66bab52..20c58a5495c02b7447740aaad5c7ad0f7402f088 100644
--- a/doc/www-data.in/index
+++ b/doc/www-data.in/index
@@ -1,3 +1,13 @@
+{% text blurb en %}
+
+# Tarantool
+## high performance in-memory key-value storage
+
+{% text blurb ru %}
+
+# Tarantool
+## high performance in-memory key-value storage
+
{% text home_page_news en %}
Stay Informed