Author: nivanov Date: Tue Feb 17 21:13:23 2015 New Revision: 1660499 URL: http://svn.apache.org/r1660499 Log: Some fixes.
Modified: incubator/ignite/site/trunk/css/all.css incubator/ignite/site/trunk/features.html incubator/ignite/site/trunk/scss/ignite.scss Modified: incubator/ignite/site/trunk/css/all.css URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/css/all.css?rev=1660499&r1=1660498&r2=1660499&view=diff ============================================================================== --- incubator/ignite/site/trunk/css/all.css (original) +++ incubator/ignite/site/trunk/css/all.css Tue Feb 17 21:13:23 2015 @@ -7933,107 +7933,3 @@ div#banner1 p { .key-features #features { padding-top: 100px; } -.key-features #features table { - margin: 40px 0; - border: none; - border-spacing: 10px; - border-collapse: separate; -} -.key-features #features table tbody > tr > td, -.key-features #features table tbody > tr > td:first-child { - padding: 15px 15px; - text-align: center; - vertical-align: middle; - font-weight: 400; - width: 100px; -} -.key-features #features table td.datagrid { - background: #1bc4a3; - border: 2px solid #16a085; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.datagrid > a { - color: #fff; -} -.key-features #features table td.computegrid { - background: #eb6d60; - border: 2px solid #E74C3C; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.computegrid > a { - color: #fff; -} -.key-features #features table td.servicegrid { - background: #f3cd36; - border: 2px solid #F1C40F; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.servicegrid > a { - color: #fff; -} -.key-features #features table td.streaming { - background: #57aae1; - border: 2px solid #3498db; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.streaming > a { - color: #fff; -} -.key-features #features table td.hadoop { - background: #ac75c2; - border: 2px solid #9b59b6; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.hadoop > a { - color: #fff; -} -.key-features #features table td.filesystem { - background: #ea9347; - border: 2px solid #E67E22; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.filesystem > a { - color: #fff; -} -.key-features #features table td.clustering { - background: #435d78; - border: 2px solid #34495e; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.clustering > a { - color: #fff; -} -.key-features #features table td.events { - background: #d44e40; - border: 2px solid #C0392B; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.events > a { - color: #fff; -} -.key-features #features table td.messaging { - background: #1fe0ba; - border: 2px solid #1abc9c; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.messaging > a { - color: #fff; -} -.key-features #features table td.datastructures { - background: #959fa0; - border: 2px solid #7F8C8D; - border-radius: 6px; - margin: 5px; -} -.key-features #features table td.datastructures > a { - color: #fff; -} Modified: incubator/ignite/site/trunk/features.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/features.html?rev=1660499&r1=1660498&r2=1660499&view=diff ============================================================================== --- incubator/ignite/site/trunk/features.html (original) +++ incubator/ignite/site/trunk/features.html Tue Feb 17 21:13:23 2015 @@ -126,16 +126,16 @@ under the License. <div class="examples-heading">Examples:</div> <!-- Nav tabs --> <ul id="datagrid-examples" class="nav nav-tabs"> - <li class="active"><a href="#datagrid-example-basic" aria-controls="home" data-toggle="tab">Put and Get</a></li> - <li><a href="#datagrid-example-transactions" aria-controls="profile" data-toggle="tab">Transactions</a></li> - <li><a href="#datagrid-example-locks" aria-controls="profile" data-toggle="tab">Locks</a></li> - <li><a href="#datagrid-example-sqlquery" aria-controls="profile" data-toggle="tab">SQL Query</a></li> - <li><a href="#datagrid-example-sqljoin" aria-controls="profile" data-toggle="tab">SQL Join</a></li> + <li class="active"><a href="#datagrid-example-basic" role="tab" data-toggle="tab">Put and Get</a></li> + <li><a href="#datagrid-example-transactions" role="tab" data-toggle="tab">Transactions</a></li> + <li><a href="#datagrid-example-locks" role="tab" data-toggle="tab">Locks</a></li> + <li><a href="#datagrid-example-sqlquery" role="tab" data-toggle="tab">SQL Query</a></li> + <li><a href="#datagrid-example-sqljoin" role="tab" data-toggle="tab">SQL Join</a></li> </ul> <!-- Tab panes --> <div class="tab-content"> - <div class="tab-pane active" id="datagrid-example-basic"> + <div role="tabpanel" class="tab-pane active" id="datagrid-example-basic"> <br/> <p> Basic cache operations example. @@ -165,7 +165,7 @@ under the License. cache.replace(1, "1", "2"); </pre> </div> - <div class="tab-pane" id="datagrid-example-transactions"> + <div role="tabpanel" class="tab-pane" id="datagrid-example-transactions"> <br/> <p> Transaction example demonstrating multiple reads and puts done atomically. @@ -191,7 +191,7 @@ under the License. } </pre> </div> - <div class="tab-pane" id="datagrid-example-locks"> + <div role="tabpanel" class="tab-pane" id="datagrid-example-locks"> <br/> <p> Synchronously acquire and release lock by key. @@ -216,7 +216,7 @@ under the License. } </pre> </div> - <div class="tab-pane" id="datagrid-example-sqlquery"> + <div role="tabpanel" class="tab-pane" id="datagrid-example-sqlquery"> <br/> <p> Person class definition. @@ -258,7 +258,7 @@ under the License. print("People with salaries between 1000 and 2000: ", qry.execute(1000, 2000).get()); </pre> </div> - <div class="tab-pane" id="datagrid-example-sqljoin"> + <div role="tabpanel" class="tab-pane" id="datagrid-example-sqljoin"> <br/> <p> Person class definition. @@ -984,7 +984,6 @@ under the License. <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script type="text/javascript">window.jQuery || document.write('<script src="js/jquery-1.11.1.min.js"><\/script>')</script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script> -<script type="text/javascript" src="js/jquery.main.js"></script> <script type="text/javascript"> if (navigator.userAgent.match(/IEMobile\/10\.0/)) { var msViewportStyle = document.createElement('style'); @@ -996,72 +995,5 @@ under the License. document.querySelector('head').appendChild(msViewportStyle) } </script> -<script type="text/javascript"> - // Data grid examples init. - $('ul#datagrid-examples a[href="datagrid-example-basic"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#datagrid-examples a[href="datagrid-example-transactions"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#datagrid-examples a[href="datagrid-example-locks"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#datagrid-examples a[href="datagrid-example-sqlquery"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#datagrid-examples a[href="datagrid-example-sqljoin"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - - // Compute grid examples init. - $('ul#compute-examples a[href="compute-example-broadcast"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#compute-examples a[href="compute-example-runnable"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - $('ul#compute-examples a[href="compute-example-closure"]').click(function (e) { e.preventDefault(); $(this).tab('show') }); - // - // $('ul#compute-examples a[href="service-example"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="messaging-example-ordered"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="messaging-example-unordered"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="events-example-cache"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="clustering-example-broadcast"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="clustering-example-unicast"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="datastructures-example-queue"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="datastructures-example-set"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }); - // - // $('ul#compute-examples a[href="datastructures-example-sequence"]').click(function (e) { - // e.preventDefault(); - // - // $(this).tab('show') - // }) -</script> </body> </html> Modified: incubator/ignite/site/trunk/scss/ignite.scss URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/scss/ignite.scss?rev=1660499&r1=1660498&r2=1660499&view=diff ============================================================================== --- incubator/ignite/site/trunk/scss/ignite.scss (original) +++ incubator/ignite/site/trunk/scss/ignite.scss Tue Feb 17 21:13:23 2015 @@ -361,123 +361,9 @@ div#banner1 { #features { padding-top: 100px; - - table { - margin: 40px 0; - border: none; - border-spacing: 10px; - border-collapse: separate; - - tbody > tr > td, - tbody > tr > td:first-child { - padding: 15px 15px; - text-align: center; - vertical-align: middle; - font-weight: 400; - width: 100px; - - } - - td.datagrid { - background: lighten(#16a085, 8%); - border: 2px solid #16a085; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.computegrid { - background: lighten(#E74C3C, 8%); - border: 2px solid #E74C3C; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.servicegrid { - background: lighten(#F1C40F, 8%); - border: 2px solid #F1C40F; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.streaming { - background: lighten(#3498db, 8%); - border: 2px solid #3498db; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.hadoop { - background: lighten(#9b59b6, 8%); - border: 2px solid #9b59b6; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.filesystem { - background: lighten(#E67E22, 8%); - border: 2px solid #E67E22; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.clustering { - background: lighten(#34495e, 8%); - border: 2px solid #34495e; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.events { - background: lighten(#C0392B, 8%); - border: 2px solid #C0392B; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.messaging { - background: lighten(#1abc9c, 8%); - border: 2px solid #1abc9c; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - td.datastructures { - background: lighten(#7F8C8D, 8%); - border: 2px solid #7F8C8D; - border-radius: 6px; - margin: 5px; - - & > a { - color: #fff; - } - } - } } } + +.tab-content > .tab-pane { + display: block; +}