Author: anovikov
Date: Wed Oct 21 06:10:52 2015
New Revision: 1709727
URL: http://svn.apache.org/viewvc?rev=1709727&view=rev
Log:
Added table export
Added:
ignite/site/trunk/images/ico-csv.png (with props)
ignite/site/trunk/images/ico-json.png (with props)
ignite/site/trunk/images/ico-pdf.png (with props)
ignite/site/trunk/images/ico-xls.png (with props)
ignite/site/trunk/images/ico-xml.png (with props)
Modified:
ignite/site/trunk/benchmarks/ignite-vs-hazelcast.html
ignite/site/trunk/css/all.css
ignite/site/trunk/includes/scripts.html
ignite/site/trunk/index.html
ignite/site/trunk/scss/_bootstrap-custom.scss
ignite/site/trunk/scss/all.scss
ignite/site/trunk/scss/ignite.scss
Modified: ignite/site/trunk/benchmarks/ignite-vs-hazelcast.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/benchmarks/ignite-vs-hazelcast.html?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/benchmarks/ignite-vs-hazelcast.html (original)
+++ ignite/site/trunk/benchmarks/ignite-vs-hazelcast.html Wed Oct 21 06:10:52
2015
@@ -58,33 +58,37 @@ under the License.
benchmark execution.
</p>
- <table style="width: 70% !important;" class="formatted">
- <thead>
- <tr>
- <th colspan="2" style="text-align:center;">
- Technical Details
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><b>Hardware</b></td>
- <td>c4.2xlarge</td>
- </tr>
- <tr>
- <td><b>CPU</b></td>
- <td>8</td>
- </tr>
- <tr>
- <td><b>RAM (GB)</b></td>
- <td>15</td>
- </tr>
- <tr>
- <td><b>Number of Nodes</b></td>
- <td>4</td>
- </tr>
- </tbody>
- </table>
+ <div class="row">
+ <div class="col-sm-8 col-md-7 col-xs-12">
+ <table class="formatted">
+ <thead>
+ <tr>
+ <th colspan="2" style="text-align:center;">
+ Technical Details
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><b>Hardware</b></td>
+ <td>c4.2xlarge</td>
+ </tr>
+ <tr>
+ <td><b>CPU</b></td>
+ <td>8</td>
+ </tr>
+ <tr>
+ <td><b>RAM (GB)</b></td>
+ <td>15</td>
+ </tr>
+ <tr>
+ <td><b>Number of Nodes</b></td>
+ <td>4</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</section>
<section id="atomic-putandgetbenchmark" class="page-section">
@@ -267,4 +271,4 @@ under the License.
</div>
<!--#include virtual="/includes/scripts.html" -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: ignite/site/trunk/css/all.css
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/css/all.css?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/css/all.css (original)
+++ ignite/site/trunk/css/all.css Wed Oct 21 06:10:52 2015
@@ -3364,7 +3364,7 @@ select[multiple].input-lg,
outline-offset: -2px;
}
.btn:hover, .btn:focus {
- color: #fff;
+ color: #333;
text-decoration: none;
}
.btn:active, .btn.active {
@@ -3383,25 +3383,25 @@ select[multiple].input-lg,
}
.btn-default {
- color: #fff;
- background-color: transparent;
- border-color: #fff;
+ color: #333;
+ background-color: #fff;
+ border-color: #ccc;
}
.btn-default:hover, .btn-default:focus, .btn-default:active,
.btn-default.active, .open > .btn-default.dropdown-toggle {
- color: #fff;
- background-color: transparent;
- border-color: #e0e0e0;
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad;
}
.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle
{
background-image: none;
}
.btn-default.disabled, .btn-default.disabled:hover,
.btn-default.disabled:focus, .btn-default.disabled:active,
.btn-default.disabled.active, .btn-default[disabled],
.btn-default[disabled]:hover, .btn-default[disabled]:focus,
.btn-default[disabled]:active, .btn-default[disabled].active,
fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active,
fieldset[disabled] .btn-default.active {
- background-color: transparent;
- border-color: #fff;
+ background-color: #fff;
+ border-color: #ccc;
}
.btn-default .badge {
- color: transparent;
- background-color: #fff;
+ color: #fff;
+ background-color: #333;
}
.btn-primary {
@@ -7187,6 +7187,7 @@ p {
#main table th {
font-size: 18px;
line-height: 20px;
+ height: 50px;
}
@media (max-width: 992px) {
#main table th {
@@ -7990,6 +7991,7 @@ table.formatted {
border: 1px solid #ddd !important;
width: 98% !important;
margin-bottom: 40px;
+ position: relative;
}
table.formatted > thead > tr {
background: #cfcfcf;
@@ -8275,3 +8277,48 @@ section.news-section a {
font-style: normal;
font-size: 15px;
}
+
+.btn-transparent {
+ color: #fff;
+ background-color: transparent;
+ border-color: #fff;
+}
+.btn-transparent:hover, .btn-transparent:focus, .btn-transparent:active,
.btn-transparent.active, .open > .btn-transparent.dropdown-toggle {
+ color: #fff;
+ background-color: transparent;
+ border-color: #e0e0e0;
+}
+.btn-transparent:active, .btn-transparent.active, .open >
.btn-transparent.dropdown-toggle {
+ background-image: none;
+}
+.btn-transparent.disabled, .btn-transparent.disabled:hover,
.btn-transparent.disabled:focus, .btn-transparent.disabled:active,
.btn-transparent.disabled.active, .btn-transparent[disabled],
.btn-transparent[disabled]:hover, .btn-transparent[disabled]:focus,
.btn-transparent[disabled]:active, .btn-transparent[disabled].active,
fieldset[disabled] .btn-transparent, fieldset[disabled] .btn-transparent:hover,
fieldset[disabled] .btn-transparent:focus, fieldset[disabled]
.btn-transparent:active, fieldset[disabled] .btn-transparent.active {
+ background-color: transparent;
+ border-color: #fff;
+}
+.btn-transparent .badge {
+ color: transparent;
+ background-color: #fff;
+}
+
+.btn-transparent:hover {
+ background: #fff;
+ color: #555555;
+}
+
+.btn-group-export {
+ position: absolute;
+ margin: 5px;
+ top: 0;
+ right: 0;
+ z-index: 4;
+}
+
+.btn-export {
+ min-width: 0;
+}
+
+@media screen and (max-width: 767px) {
+ .btn-group-export {
+ display: none;
+ }
+}
Added: ignite/site/trunk/images/ico-csv.png
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/images/ico-csv.png?rev=1709727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ignite/site/trunk/images/ico-csv.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ignite/site/trunk/images/ico-json.png
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/images/ico-json.png?rev=1709727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ignite/site/trunk/images/ico-json.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ignite/site/trunk/images/ico-pdf.png
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/images/ico-pdf.png?rev=1709727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ignite/site/trunk/images/ico-pdf.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ignite/site/trunk/images/ico-xls.png
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/images/ico-xls.png?rev=1709727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ignite/site/trunk/images/ico-xls.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ignite/site/trunk/images/ico-xml.png
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/images/ico-xml.png?rev=1709727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ignite/site/trunk/images/ico-xml.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ignite/site/trunk/includes/scripts.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/includes/scripts.html?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/includes/scripts.html (original)
+++ ignite/site/trunk/includes/scripts.html Wed Oct 21 06:10:52 2015
@@ -1,7 +1,7 @@
<!-- REMEMBER TO COPY ALL CHANGES TO download.html -->
-<script type="text/javascript"
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+<script type="text/javascript"
src="//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
src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
@@ -52,3 +52,46 @@
});
}
</script>
+
+<!-- Table export -->
+<script type="text/javascript"
src="//cdn.rawgit.com/hhurz/tableExport.jquery.plugin/master/libs/FileSaver/FileSaver.min.js"></script>
+<script type="text/javascript"
src="//cdn.rawgit.com/hhurz/tableExport.jquery.plugin/master/libs/jsPDF/jspdf.min.js"></script>
+<script type="text/javascript"
src="//cdn.rawgit.com/hhurz/tableExport.jquery.plugin/master/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js"></script>
+<script type="text/javascript"
src="//cdn.rawgit.com/hhurz/tableExport.jquery.plugin/master/tableExport.min.js"></script>
+
+<script type="text/javascript">
+$(document).ready(function() {
+ var expBtnDesc = [
+ {type:'json', text: 'JSON', icon:'ico-json.png'},
+ {type:'xml', text: 'XML', icon:'ico-xml.png'},
+ {type:'csv', text: 'CSV', icon:'ico-csv.png'},
+ {type:'excel', text: 'XLS', icon:'ico-xls.png'},
+ {type:'pdf', text: 'PDF', icon:'ico-pdf.png'}
+ ];
+
+ $("table").each(function (ix) {
+ var insert = '' +
+ '<div class="btn-group btn-group-export" title="Export table
content to selected format">\n' +
+ ' <button class="btn btn-default btn-export btn-sm
dropdown-toggle fa fa-download" data-toggle="dropdown"> <i class="fa
fa-caret-down"/></button>\n' +
+ ' <ul class="dropdown-menu dropdown-menu-right" role="menu">\n';
+
+ var id = this.id || 'table' + ix;
+
+ this.id = id;
+
+ $.each(expBtnDesc, function (ix, btn) {
+ insert += " <li><a href='#' onclick='$(\"#" + id +
"\").tableExport({type:\"" + btn.type + "\"});'>" +
+ "<img src='/images/" + btn.icon + "' width='24px'/> " +
btn.text +
+ "</a></li>\n";
+
+ if (ix < expBtnDesc.length - 1)
+ insert += ' <li class="divider"></li>\n';
+ });
+
+ insert += ' </ul>\n'+
+ '</div>\n';
+
+ $(this).find('thead').before(insert);
+ });
+});
+</script>
Modified: ignite/site/trunk/index.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/index.html?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/index.html (original)
+++ ignite/site/trunk/index.html Wed Oct 21 06:10:52 2015
@@ -55,7 +55,7 @@ under the License.
<p>In-Memory Data Fabric</p>
<ul class="buttons list-unstyled">
<!-- <li><a href="#download" class="btn
btn-danger">Download</a></li> -->
- <li><a href="features.html" class="btn
btn-default">Learn More</a></li>
+ <li><a href="features.html" class="btn
btn-transparent">Learn More</a></li>
</ul>
</div>
</div>
Modified: ignite/site/trunk/scss/_bootstrap-custom.scss
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/scss/_bootstrap-custom.scss?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/scss/_bootstrap-custom.scss (original)
+++ ignite/site/trunk/scss/_bootstrap-custom.scss Wed Oct 21 06:10:52 2015
@@ -35,9 +35,9 @@ $headings-font-weight: 700;
$icon-font-path: "../fonts/";
/* Buttons */
-$btn-default-color: $white;
-$btn-default-bg: transparent;
-$btn-default-border: $white;
+$btn-transparent-color: $white;
+$btn-transparent-bg: transparent;
+$btn-transparent-border: $white;
$btn-danger-color: $white;
$btn-danger-bg: $red-dark;
@@ -67,4 +67,4 @@ $navbar-default-toggle-icon-bar-bg: $whi
/* Media queries breakpoints */
$tablet: 992px;
$mobile: 767px;
-$min-mobile: 768px;
\ No newline at end of file
+$min-mobile: 768px;
Modified: ignite/site/trunk/scss/all.scss
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/scss/all.scss?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/scss/all.scss (original)
+++ ignite/site/trunk/scss/all.scss Wed Oct 21 06:10:52 2015
@@ -376,7 +376,7 @@ p {
th{
font-size: 18px;
line-height: 20px;
-
+ height: 50px;
@media (max-width: $tablet) {
font-size: 15px;
}
@@ -734,3 +734,29 @@ p {
@import "ignite";
+.btn-transparent {
+ @include button-variant($btn-transparent-color, $btn-transparent-bg,
$btn-transparent-border);
+}
+
+.btn-transparent:hover {
+ background: $white;
+ color: $gray;
+}
+
+.btn-group-export {
+ position: absolute;
+ margin: 5px;
+ top: 0;
+ right: 0;
+ z-index: 4;
+}
+
+.btn-export {
+ min-width: 0;
+}
+
+@media screen and (max-width: $screen-xs-max) {
+ .btn-group-export {
+ display: none;
+ }
+}
Modified: ignite/site/trunk/scss/ignite.scss
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/scss/ignite.scss?rev=1709727&r1=1709726&r2=1709727&view=diff
==============================================================================
--- ignite/site/trunk/scss/ignite.scss (original)
+++ ignite/site/trunk/scss/ignite.scss Wed Oct 21 06:10:52 2015
@@ -445,6 +445,7 @@ table.formatted {
border: 1px solid #ddd !important;
width: 98% !important;
margin-bottom: 40px;
+ position: relative;
& > thead > tr {
background: #cfcfcf;
