From 831282b1190eeb0712c631e875366423d4e3a075 Mon Sep 17 00:00:00 2001 From: Konstantin Osipov <kostja@tarantool.org> Date: Mon, 6 Jun 2016 18:22:35 +0300 Subject: [PATCH] Update the website. * wallarm button alignment * better action calls * remove obsolete benchmarks & example --- doc/www/content/newsite/index.yml | 30 --------------- doc/www/theme/static/design.css | 1 + doc/www/theme/templates/index.html | 60 ++++-------------------------- 3 files changed, 9 insertions(+), 82 deletions(-) diff --git a/doc/www/content/newsite/index.yml b/doc/www/content/newsite/index.yml index 30c3e253d0..22ddc3d1f3 100644 --- a/doc/www/content/newsite/index.yml +++ b/doc/www/content/newsite/index.yml @@ -60,34 +60,4 @@ blocks : content: > Terms of commercial 24x7 support are available upon request, please send an inquiry to support@tarantool.org - example: - format: rst - content: | - .. code-block:: lua - :linenos: none - - #!/usr/bin/env tarantool - - box.cfg{} - hosts = box.space.hosts - if not hosts then - hosts = box.schema.create_space('hosts') - hosts:create_index('primary', - {parts = {1, 'STR'}}) - end - - local function handler(self) - local host = self.peer.host - local response = { - host = host; - counter = hosts:inc(host); - } - return self:render{ json = response } - end - - httpd = require('http.server') - server = httpd.new('127.0.0.1', 8080) - server:route({ path = '/' }, handler) - server:start() - video: '<iframe src="//www.youtube.com/embed/R9UHoZDFLWg" frameborder="0" allowfullscreen></iframe>' ... diff --git a/doc/www/theme/static/design.css b/doc/www/theme/static/design.css index b9851df341..b36e9378e0 100644 --- a/doc/www/theme/static/design.css +++ b/doc/www/theme/static/design.css @@ -545,6 +545,7 @@ h1, h2, h3, h4, h5 { .i-wallarm { width:130px; height:63px; + margin-bottom: 36px; } .i-wallarm:after, .i-wallarm:before { diff --git a/doc/www/theme/templates/index.html b/doc/www/theme/templates/index.html index a9048c28af..8daed9e718 100644 --- a/doc/www/theme/templates/index.html +++ b/doc/www/theme/templates/index.html @@ -9,10 +9,15 @@ {% block content %} <section class="b-gray_block b-mainhead"> <div class="b-block-wrapper"> - <a href="https://github.com/tarantool/tarantool/" class="b-follow">Follow on</a> - <h1 class="b-Tarantool_title" >{{ page.blocks.header[0] }}</h1> + <!-- <a href="https://github.com/tarantool/tarantool/" class="b-follow">Follow on</a> --> + <div class="header-logo"></div> <h2 class="b-Tarantool_title-note">{{ page.blocks.header[1] }}</h2> <p class="b-Tarantool_title-text">{{ page.blocks.header[2] }}</p> + <div class="buttons-header"> + <a href="http://tarantool.org/download.html" class="b-button-red-download">DOWNLOAD</a> + <a href="https://github.com/tarantool/tarantool/" + class="b-button-white">FOLLOW ON GITHUB</a> + </div> </div> </section> @@ -82,56 +87,6 @@ </div> </section> -<section class="b-gray_block b-example"> - <div class="b-block-wrapper"> - <h2 class="b-section-title">Example</h2> - <div class="b-cols p-example"> - <div class="b-cols-item"> - <div class="b-example-code"> - {{ page.blocks.example }} - </div> - </div> - <div class="b-cols-item-empty"> </div> - <div class="b-cols-item"> - <div class="b-example-player"> - {{ page.blocks.video }} - </div> - </div> - </div> - </div> -</section> - -<section class="b-block b-benchmark"> - <div class="b-block-wrapper"> - <h2 class="b-section-title">Our benchmarks (YCSB)</h2> - <div class="b-block-wrapper_bench"> - <div class="b-benchmark-catalog"> - <ul class="b-switcher"> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url p-active">A</a></li> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url">B</a></li> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url">C</a></li> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url">D</a></li> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url">E</a></li> - <li class="b-switcher-item"><a href="#" class="b-switcher-item-url">F</a></li> - </ul> - </div> - <div class="b-benchmark-type"> - <ul class="b-switcher"> - <li class="b-switcher-item"> - <a href="#" class="b-switcher-item-url p-active">Throughput</a> - </li> - <li class="b-switcher-item"> - <a href="#" class="b-switcher-item-url">Latency</a> - </li> - </ul> - </div> - <h3 class="b-benchmark-type-title">Workload A</h3> - </div> - <div class="b-benchmark-grapf"><div id="b-benchmark-grapf-image"></div></div> - <div class="b-benchmark-more"> <a href="/benchmark.html">Learn more</a></div> - </div> -</section> - <section class="b-gray_block b-customers"> <div class="b-block-wrapper"> <h2 class="b-section-title">Our users</h2> @@ -162,6 +117,7 @@ </div> </div> </section> + {% endblock content %} {# vim: syntax=htmldjango ts=2 sts=2 sw=2 expandtab #} -- GitLab