Author: dmagda
Date: Wed Nov 29 00:46:56 2017
New Revision: 1816587
URL: http://svn.apache.org/viewvc?rev=1816587&view=rev
Log:
Branch for the features menu changes
Added:
ignite/site/branches/ignite-7061/ (props changed)
- copied from r1816577, ignite/site/trunk/
ignite/site/branches/ignite-7061/features/multilanguage.html
- copied, changed from r1816577, ignite/site/trunk/features/java.html
Modified:
ignite/site/branches/ignite-7061/features/java.html
ignite/site/branches/ignite-7061/includes/header.html
Propchange: ignite/site/branches/ignite-7061/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 29 00:46:56 2017
@@ -0,0 +1,3 @@
+/ignite/site/ignite-6036:1805444-1805983
+/ignite/site/trunk:1805945-1805982
+/incubator/ignite/site/branches/sidenav:1646576-1658604
Modified: ignite/site/branches/ignite-7061/features/java.html
URL:
http://svn.apache.org/viewvc/ignite/site/branches/ignite-7061/features/java.html?rev=1816587&r1=1816577&r2=1816587&view=diff
==============================================================================
Binary files - no diff available.
Copied: ignite/site/branches/ignite-7061/features/multilanguage.html (from
r1816577, ignite/site/trunk/features/java.html)
URL:
http://svn.apache.org/viewvc/ignite/site/branches/ignite-7061/features/multilanguage.html?p2=ignite/site/branches/ignite-7061/features/multilanguage.html&p1=ignite/site/trunk/features/java.html&r1=1816577&r2=1816587&rev=1816587&view=diff
==============================================================================
Binary files - no diff available.
Modified: ignite/site/branches/ignite-7061/includes/header.html
URL:
http://svn.apache.org/viewvc/ignite/site/branches/ignite-7061/includes/header.html?rev=1816587&r1=1816577&r2=1816587&view=diff
==============================================================================
--- ignite/site/branches/ignite-7061/includes/header.html (original)
+++ ignite/site/branches/ignite-7061/includes/header.html Wed Nov 29 00:46:56
2017
@@ -52,71 +52,48 @@
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="/features.html">Features<span
class="caret"></span></a>
- <ul class="dropdown-menu lg-screen-menu"
role="menu">
- <div class="col-md-6 col-sm-6
col-xs-12 items" style="padding-right: 35px; border-right: 1px solid #d7d7d7;">
- <li role="presentation"
class="submenu-header">Overview</li>
- <li><a
href="/whatisignite.html">What is Ignite™?</a></li>
- <li><a
href="/memorycentric.html">What is Memory-Centric?</a></li>
- <li><a
href="/collocatedprocessing.html">What is Collocated Processing?</a></li>
- <li role="presentation"
class="submenu-header">Main Features</li>
- <li><a
href="/features/durablememory.html">Durable Memory</a></li>
- <li><a
href="/features/persistence.html">Native Persistence</a></li>
- <li><a
href="/features/sql.html">SQL Database</a></li>
- <li><a
href="/features/datagrid.html">Data Grid</a></li>
- <li><a
href="/features/computegrid.html">Compute Grid</a></li>
- <li><a
href="/features/streaming.html">Streaming</a></li>
- <li><a
href="/features/machinelearning.html">Machine
Learning<sup>βeta</sup></a></li>
- <li><a
href="/features.html"><i>More Features</i></a></li>
- <li role="presentation"
class="submenu-header">Tooling</li>
- <li><a
href="/features/datavisualization.html#apache-ignite-web-console">Ignite Web
Console</a></li>
- <li><a
href="/features/datavisualization.html"><i>More Tooling</i></a></li>
- </div>
- <div class="col-md-6 col-sm-6
col-xs-12 items" >
- <li role="presentation"
class="submenu-header">Runs Everywhere</li>
- <li><a
href="/features/java.html">Java</a></li>
- <li><a
href="/features/dotnet.html">.NET</a></li>
- <li><a
href="/features/cpp.html">C++</a></li>
- <li><a
href="/features/clientprotos.html">Client Protocols</a></li>
- <li><a
href="/features/deploy.html">Deployment Options</a></li>
- <li role="presentation"
class="submenu-header">Hadoop & Spark</li>
- <li><a
href="/features/igniterdd.html">Spark Shared RDDs</a></li>
- <li><a
href="/features/igfs.html">In-Memory File System</a></li>
- <li><a
href="/features/mapreduce.html">In-Memory MapReduce</a></li>
- <li role="presentation"
class="submenu-header">Add-Ons</li>
- <li><a
href="/addons.html#ga-grid">GA Grid<sup>βeta</sup></a></li>
- <li><a href="/addons.html"><i>More
Add-ons</i></a></li>
- </div>
- </ul>
- <ul class="dropdown-menu mobile-menu"
role="menu">
- <li role="presentation"
class="submenu-header">Overview</li>
+ <ul class="dropdown-menu" role="menu">
<li><a href="/whatisignite.html">What
is Ignite™?</a></li>
- <li><a href="/memorycentric.html">What
is Memory-Centric?</a></li>
- <li><a
href="/collocatedprocessing.html">What is Collocated Processing?</a></li>
- <li role="presentation"
class="submenu-header">Main Features</li>
- <li><a
href="/features/durablememory.html">Durable Memory</a></li>
- <li><a
href="/features/persistence.html">Native Persistence</a></li>
- <li><a href="/features/sql.html">SQL
Database</a></li>
- <li><a
href="/features/datagrid.html">Data Grid</a></li>
- <li><a
href="/features/computegrid.html">Compute Grid</a></li>
- <li><a
href="/features/streaming.html">Streaming</a></li>
+
+ <!-- Ignite main features. -->
+ <li role="presentation"
class="submenu-header">Features</li>
+ <li><a
href="/features/sql.html">SQL</a></li>
+ <li><a href="#">Key-Value</a></li>
+ <li><a href="#">Transactions</a></li>
+ <li><a
href="/collocatedprocessing.html">Collocation</a></li>
<li><a
href="/features/machinelearning.html">Machine
Learning<sup>βeta</sup></a></li>
+ <li><a
href="/features/multilanguage.html">Multi-Language</a></li>
<li><a href="/features.html"><i>More
Features</i></a></li>
+ <li class="divider">
+
+ <!-- Ignite architecture overview. -->
+ <li role="presentation"
class="submenu-header">Architecture</li>
+ <li><a href="#">Overview</a></li>
+ <li><a href="#">Clustering and
Deployment</a></li>
+ <li><a href="#">Distributed
Database</a></li>
+ <li><a
href="/features/durablememory.html">Durable Memory</a></li>
+ <li class="divider">
+
+ <!-- Ignite tooling. -->
<li role="presentation"
class="submenu-header">Tooling</li>
<li><a
href="/features/datavisualization.html#apache-ignite-web-console">Ignite Web
Console</a></li>
- <li><a
href="/features/datavisualization.html"><i>More Tooling</i></a></li>
- <li role="presentation"
class="submenu-header">Runs Everywhere</li>
- <li><a
href="/features/java.html">Java</a></li>
- <li><a
href="/features/dotnet.html">.NET</a></li>
- <li><a
href="/features/cpp.html">C++</a></li>
- <li><a
href="/features/clientprotos.html">Client Protocols</a></li>
- <li><a
href="/features/deploy.html">Deployment Options</a></li>
- <li role="presentation"
class="submenu-header">Hadoop & Spark</li>
- <li><a
href="/features/igniterdd.html">Spark Shared RDDs</a></li>
- <li><a
href="/features/igfs.html">In-Memory File System</a></li>
- <li><a
href="/features/mapreduce.html">In-Memory MapReduce</a></li>
- <li role="presentation"
class="submenu-header">Add-Ons</li>
- <li><a href="/addons.html#ga-grid">GA
Grid<sup>βeta</sup></a></li>
- <li><a href="/addons.html"><i>More
Add-ons</i></a></li>
+ <li><a
href="/features/datavisualization.html">Data Visualization and Analysis</a></li>
+
+ <!--<div class="col-md-6 col-sm-6
col-xs-12 items" >-->
+ <!--<li role="presentation"
class="submenu-header">Runs Everywhere</li>-->
+ <!--<li><a
href="/features/java.html">Java</a></li>-->
+ <!--<li><a
href="/features/dotnet.html">.NET</a></li>-->
+ <!--<li><a
href="/features/cpp.html">C++</a></li>-->
+ <!--<li><a
href="/features/clientprotos.html">Client Protocols</a></li>-->
+ <!--<li><a
href="/features/deploy.html">Deployment Options</a></li>-->
+ <!--<li role="presentation"
class="submenu-header">Hadoop & Spark</li>-->
+ <!--<li><a
href="/features/igniterdd.html">Spark Shared RDDs</a></li>-->
+ <!--<li><a
href="/features/igfs.html">In-Memory File System</a></li>-->
+ <!--<li><a
href="/features/mapreduce.html">In-Memory MapReduce</a></li>-->
+ <!--<li role="presentation"
class="submenu-header">Add-Ons</li>-->
+ <!--<li><a
href="/addons.html#ga-grid">GA Grid<sup>βeta</sup></a></li>-->
+ <!--<li><a
href="/addons.html"><i>More Add-ons</i></a></li>-->
+ <!--</div>-->
</ul>
</li>
<li class="dropdown">
@@ -126,6 +103,7 @@
<li><a
href="/use-cases/database/distributed-database.html">Distributed
Database</a></li>
<li><a
href="/use-cases/database/in-memory-database.html">In-Memory Database</a></li>
<!--<li><a
href="/use-cases/database/sql-database.html">SQL Database</a></li>-->
+ <li><a
href="/features/datagrid.html">Data Grid</a></li>
<li><a
href="/use-cases/database/key-value-store.html">Key-Value Store</a></li>
<li class="divider">
<li role="presentation"
class="submenu-header">Comparison</li>
