This commit is contained in:
Dmitry Voytsekhovskiy 2016-03-24 18:46:17 +03:00
Родитель c3745ea790
Коммит a20f93eb04
8 изменённых файлов: 135 добавлений и 12 удалений

Просмотреть файл

@ -1,3 +1,8 @@
## 0.1.1 (March 24, 2016)
* Bower package 'angara.tablejs' doesn't need `jquery.datatable.css` of the DataTables; all required styles are in the `angara.tablejs.css`.
* Images and styles updated. All needed images are under `dist/img`.
## 0.1.0 (March 23, 2016)
Angara.Table exposes types to represent and manipulate with tables, as well as HTML5 table visualization control.

Просмотреть файл

@ -31,7 +31,9 @@
"typings",
"Gruntfile.js",
"package.json",
"tsd.json"
"tsd.json",
"SetVersion.js",
"NuGet.Config"
],
"dependencies": {
"modernizr": "~2.8.3",

Двоичные данные
src/Angara.TableJS/images/back.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 248 B

Двоичные данные
src/Angara.TableJS/images/forward.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 256 B

Просмотреть файл

@ -3,24 +3,20 @@
<head>
<title></title>
<meta charset="utf-8" />
<!-- bower:css -->
<link rel="stylesheet" href="../../../bower_components/idd/dist/idd.css" />
<link rel="stylesheet" href="../../../bower_components/idd/dist/chartViewer.css" />
<link rel="stylesheet" href="../../../bower_components/DataTables/media/css/jquery.dataTables.css" />
<!-- endbower -->
<!-- bower:js -->
<script src="../../../bower_components/jquery/dist/jquery.js"></script>
<script src="../../../bower_components/modernizr/modernizr.js"></script>
<script src="../../../bower_components/rxjs/dist/rx.all.js"></script>
<script src="../../../bower_components/jqueryui/jquery-ui.js"></script>
<script src="../../../bower_components/idd/dist/idd.js"></script>
<script src="../../../bower_components/idd/dist/chartViewer.js"></script>
<script src="../../../bower_components/idd/dist/chartViewer.umd.js"></script>
<script src="../../../bower_components/DataTables/media/js/jquery.dataTables.js"></script>
<!-- endbower -->
<link href="../styles/angara.tablejs.css" rel="stylesheet" />
<link href="../styles/samples.css" rel="stylesheet" />
<script src="../../../dist/angara.tablejs.js"></script>
<link href="../../../dist/angara.tablejs.css" rel="stylesheet" />
<link href="../styles/samples.css" rel="stylesheet" />
<script src="../../../dist/angara.tablejs.js"></script>
<script type="text/javascript">
$(document).ready(function () {
var source = {

Просмотреть файл

@ -1,4 +1,4 @@
define(["jquery", "angara.tablejs", "exports"], function ($, TableJs, exports) {
define(["jquery", "angara.tablejs", "exports"], function ($, TableViewer, exports) {
exports.Show = function (tableSource, container) {
TableViewer.show(container, tableSource);
};

Просмотреть файл

@ -147,7 +147,7 @@
// it is called only after the _drawSummary which makes initial settings for the 'chart', too.
if (pdf) {
var drawArgs = {};
drawArgs.fill = "lightblue";
drawArgs.fill = "#E8F3FF";
if (typeof (pdf.x) === 'undefined' || typeof (pdf.f) === 'undefined') {
drawArgs.y1 = [];

Просмотреть файл

@ -54,6 +54,7 @@ table.dataTable {
.dataTables_length {
margin-bottom: 10px;
float: left;
}
.table-correlationView {
@ -328,3 +329,122 @@ table.dataTable tr.even td.sorting_2 {
table.dataTable tr.even td.sorting_3 {
background-color: #F9F9FF;
}
/*
* Table information
*/
.dataTables_info {
clear: both;
float: left;
margin-right: 10px;
}
/*
* Processing indicator
*/
.dataTables_processing {
position: absolute;
top: 50%;
left: 50%;
width: 250px;
height: 30px;
margin-left: -125px;
margin-top: -15px;
padding: 14px 0 2px 0;
border: 1px solid #ddd;
text-align: center;
color: #999;
font-size: 14px;
background-color: white;
}
/*
* Pagination
*/
.dataTables_paginate {
float: right;
text-align: right;
}
/* Two button pagination - previous / next */
.paginate_disabled_previous,
.paginate_enabled_previous,
.paginate_disabled_next,
.paginate_enabled_next {
height: 19px;
float: left;
cursor: pointer;
*cursor: hand;
color: #111 !important;
}
.paginate_disabled_previous:hover,
.paginate_enabled_previous:hover,
.paginate_disabled_next:hover,
.paginate_enabled_next:hover {
text-decoration: none !important;
}
.paginate_disabled_previous:active,
.paginate_enabled_previous:active,
.paginate_disabled_next:active,
.paginate_enabled_next:active {
outline: none;
}
.paginate_disabled_previous,
.paginate_disabled_next {
color: #666 !important;
}
.paginate_disabled_previous,
.paginate_enabled_previous {
padding-left: 18px;
margin-left: 5px;
}
.paginate_disabled_next,
.paginate_enabled_next {
padding-right: 18px;
margin-left: 10px;
}
.paginate_enabled_previous { background: url('img/back.png') no-repeat top left; opacity: 0.8 }
.paginate_enabled_previous:hover { background: url('img/back.png') no-repeat top left; opacity: 1.0 }
.paginate_disabled_previous { background: url('img/back.png') no-repeat top left; opacity: 0.3 }
.paginate_enabled_next { background: url('img/forward.png') no-repeat top right; opacity: 0.8 }
.paginate_enabled_next:hover { background: url('img/forward.png') no-repeat top right; opacity: 1.0 }
.paginate_disabled_next { background: url('img/forward.png') no-repeat top right; opacity: 0.3 }
/* Full number pagination */
.paging_full_numbers {
height: 22px;
line-height: 22px;
}
.paging_full_numbers a:active {
outline: none
}
.paging_full_numbers a:hover {
text-decoration: none;
}
.paging_full_numbers a.paginate_button,
.paging_full_numbers a.paginate_active {
border: 1px solid #aaa;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 2px 5px;
margin: 0 3px;
cursor: pointer;
*cursor: hand;
color: #333 !important;
}
.paging_full_numbers a.paginate_button {
background-color: #ddd;
}
.paging_full_numbers a.paginate_button:hover {
background-color: #ccc;
text-decoration: none !important;
}
.paging_full_numbers a.paginate_active {
background-color: #99B3FF;
}