Skip to content

New labels #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
texodus merged 4 commits into from
Jun 25, 2018
Merged

New labels #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b961328
support for labeled drop boxes in perspective viewer
msturdikova Jun 12, 2018
6c9ab3f
Fixed tests, reverted default styling
texodus Jun 19, 2018
582e355
Moved new label theming top Material theme
texodus Jun 25, 2018
dba2e7f
i18n labels
texodus Jun 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions packages/perspective-viewer-highcharts/test/results/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,53 @@
"superstore.html/sorts by an alpha column.": "2643e0b5787b6e8e85f122b1713d01cd",
"superstore.html/displays visible columns.": "1da296527f149393be8f3f99e34b3e4a",
"scatter.html/shows a grid without any settings applied.": "59f583a8bdd8f2041a07cd0e74a2383c",
"scatter.html/pivots by a row.": "7dbabb173cea2303e48a284b2a3d00c9",
"scatter.html/pivots by two rows.": "aa95743924b642bf370eef71fc6cdfe0",
"scatter.html/pivots by a row and a column.": "814545a92b61e60065d20901b0af0942",
"scatter.html/pivots by two rows and two columns.": "6819cc449977b18c3b2b894d49c14918",
"scatter.html/sorts by a numeric column.": "6e641ac25bdcd73c5f366e275923a77b",
"scatter.html/sorts by an alpha column.": "b60a53b855c6b1e3d4371a595cec9398",
"scatter.html/displays visible columns.": "7478f1f1c867077b1eeb06d539ed5817",
"scatter.html/pivots by a row.": "f3e5653bb56a50128f8645c78af4ea35",
"scatter.html/pivots by two rows.": "61f567b984a00332c78fcf75e5b33a1c",
"scatter.html/pivots by a row and a column.": "ddfd36120583f1435a7ca8d03606d264",
"scatter.html/pivots by two rows and two columns.": "714eae6425613cfa2b8fc7f2a137944e",
"scatter.html/sorts by a numeric column.": "1dd84fb0f9be959c6aa23a07dde167bc",
"scatter.html/sorts by an alpha column.": "19763159338fc3121cdaa87e25310c79",
"scatter.html/displays visible columns.": "f0eeb21d173300381aecc6dd4e9d68f1",
"bar.html/shows a grid without any settings applied.": "c8a1519f78169e28c53dabbc5e7f1b16",
"bar.html/pivots by a row.": "218fbb00a86070f18c2c8abddf35ec00",
"bar.html/pivots by two rows.": "b32d817ccc06b054a8ba703ea63db534",
"bar.html/pivots by a row and a column.": "4979961b094febc1a91a528dc3f59b16",
"bar.html/pivots by two rows and two columns.": "411f74d3d1d1045fd665de8cf1886929",
"bar.html/sorts by a numeric column.": "a552fd9144d995df86e01bc2584ba825",
"bar.html/sorts by an alpha column.": "2f26ed533b6836636803f15e56e4641e",
"bar.html/pivots by a row.": "f3c5b4b14996827fa6b5982b710d253f",
"bar.html/pivots by two rows.": "2edb17b1cbb215771f0afe355a0bdf63",
"bar.html/pivots by a row and a column.": "34a56da77cc18a0baf2158a3530c4e8f",
"bar.html/pivots by two rows and two columns.": "4f172f2a475dc8f2e0d9fa62487f7fde",
"bar.html/sorts by a numeric column.": "4eb99ec96805989f8122056b1ad80943",
"bar.html/sorts by an alpha column.": "d2e598f19fa5fb8bab3233e1628fad66",
"line.html/shows a grid without any settings applied.": "d9fd630cb35c1d2fb3cfc9a55e872162",
"line.html/pivots by a row.": "a3860c02fb5eaba1e75c6e0ce0206fb6",
"line.html/pivots by two rows.": "87ffe3bde34d83edab0b04a936802ce2",
"line.html/pivots by a row and a column.": "6b5e1d8925432b829c3223998ca91fe3",
"line.html/pivots by two rows and two columns.": "29389fd66776df0f55defc4a9a42e091",
"line.html/sorts by a numeric column.": "8f2d6c71cd9efbab176d4c92d55e4b12",
"line.html/sorts by an alpha column.": "e47fc8045c6a940bbe429f7f9061dfc7",
"line.html/displays visible columns.": "7adc44d927e73dbc2d1b287e78a55ff9",
"bar.html/displays visible columns.": "894dea9c17c947bd5c1928ffc49fadfc",
"scatter.html/sorts by a hidden column.": "fb934c31054918048540401705231eb3",
"line.html/sorts by a hidden column.": "ad09ff5cf17fc4cd25e934fcf517a230",
"bar.html/sorts by a hidden column.": "d93baf7a4ac6455d31544db2d314f70c",
"scatter.html/filters by a numeric column.": "43970a103158d99bc0bf366f85bce2ed",
"line.html/filters by a numeric column.": "72f9c0b8cfc945610d85c874052d0fe5",
"bar.html/filters by a numeric column.": "1a1977f0cc0c7c12bd1501ce95ebe467",
"line.html/pivots by a row.": "5567c02e0d00fff02c86a36f7842b153",
"line.html/pivots by two rows.": "c8e8a63dc56b369e26f936964a17cecb",
"line.html/pivots by a row and a column.": "1b94b728c6485a83097435217bdbad74",
"line.html/pivots by two rows and two columns.": "0ba450b7de69a2f8d93c18f84af63e06",
"line.html/sorts by a numeric column.": "560e17d9c0a9c1e8f77583eef5d61933",
"line.html/sorts by an alpha column.": "5c7515903f79d4e6b61a7ea53be63db2",
"line.html/displays visible columns.": "a437d3ec24c0d2739b8294b704703cd8",
"bar.html/displays visible columns.": "bd4daa7b08fec53f6c51e3b082646e9d",
"scatter.html/sorts by a hidden column.": "fdffc2ce997c42be418dc752afb3e3c1",
"line.html/sorts by a hidden column.": "abead4e5ccaf57aca8b9355a83b43108",
"bar.html/sorts by a hidden column.": "cb22df5c85d8cef8d0d92617a5f99292",
"scatter.html/filters by a numeric column.": "6b3b95606eb25ad15a82f5a460deb069",
"line.html/filters by a numeric column.": "e7e83de743b1d364914920e312ec1175",
"bar.html/filters by a numeric column.": "544e0e6d666cb225bea981d2a7402031",
"heatmap.html/shows a grid without any settings applied.": "7e158efd8c0decec97937e24d4cdfe0d",
"heatmap.html/pivots by a row.": "a77512950b154f233287fbfa63cc6d42",
"heatmap.html/pivots by two rows.": "ef43969a179faa3b78238f62c435249f",
"heatmap.html/pivots by a row and a column.": "98b0e9b447ecea7c427e4b08f14faec2",
"heatmap.html/pivots by two rows and two columns.": "e9280f2060314559f512e6ac193be3ac",
"heatmap.html/sorts by a hidden column.": "cf92701b055e836148a5f4d332cec342",
"heatmap.html/sorts by a numeric column.": "7e9496591d144d8c9dcefc383ade7067",
"heatmap.html/filters by a numeric column.": "f5ae636e34bdd781ae4c6e004bf8b108",
"heatmap.html/sorts by an alpha column.": "5f9ca7ad1c277d1ab897632e98714735",
"heatmap.html/displays visible columns.": "f2e5d2b34dd1585e48d9b9f552361ba0",
"heatmap.html/pivots by a row.": "b4c48bf3c25058e14c464f0f28c36686",
"heatmap.html/pivots by two rows.": "a6beca25cd890b7288dd2259121eed9d",
"heatmap.html/pivots by a row and a column.": "aac419184753aea9840fe9376f687e34",
"heatmap.html/pivots by two rows and two columns.": "5e4dda4ac8c7a85e7d6443acfa5b4b78",
"heatmap.html/sorts by a hidden column.": "76d7151033cbcdce164c88603ef90c8b",
"heatmap.html/sorts by a numeric column.": "046fba9219fd176e352094429c9e09c6",
"heatmap.html/filters by a numeric column.": "9d5852dd83a35e22f05ca7afafc86c7e",
"heatmap.html/sorts by an alpha column.": "110a485017d34ca458253b5deedf3809",
"heatmap.html/displays visible columns.": "d64a306bee807fcbef330f892b6833ad",
"treemap.html/shows a grid without any settings applied.": "642f65f20d8e41142941a26b15e01c17",
"treemap.html/pivots by a row.": "b61ce1d49a4de91a97638d99cb80bc42",
"treemap.html/pivots by two rows.": "f06a60cadd750561d58e6c468f8bc884",
"treemap.html/pivots by a row and a column.": "9bef0c41f2d8787b3f05b919ba0fc976",
"treemap.html/pivots by two rows and two columns.": "53956497b98b508020babc7ac2a560a2",
"treemap.html/sorts by a hidden column.": "93f7bd6312470093e6d90468053fcc2b",
"treemap.html/sorts by a numeric column.": "c0d3133e42b220ae0b51a03a727a7220",
"treemap.html/filters by a numeric column.": "0d641b25f1251e98bb51fae105b64cec",
"treemap.html/sorts by an alpha column.": "01ef0c304078e6547e56484a89da5589",
"treemap.html/displays visible columns.": "aa3cbce618a10759be1377a85b0de74e"
"treemap.html/pivots by a row.": "f2a865eca1f94bb6f568da5ac2f20d7f",
"treemap.html/pivots by two rows.": "1b3f16a0d6fef3d81913a7455785efb4",
"treemap.html/pivots by a row and a column.": "cb2967aa4f812a04cd2938e0c493c49d",
"treemap.html/pivots by two rows and two columns.": "34ecc4dd1d6ae935a4a10d3b206496d7",
"treemap.html/sorts by a hidden column.": "3093357c9dc555322c5b2a0350c8b1b9",
"treemap.html/sorts by a numeric column.": "f797a8ee83809945880caf5ef084f6eb",
"treemap.html/filters by a numeric column.": "2b3a588ffaba0b77287167a2d62d82f1",
"treemap.html/sorts by an alpha column.": "a00c423b6c0ad1f7e3f2afa866790461",
"treemap.html/displays visible columns.": "b16c1d3b4e08d0745226ea6335a18254"
}
1 change: 1 addition & 0 deletions packages/perspective-viewer-hypergrid/src/js/hypergrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ bindTemplate(TEMPLATE)(class HypergridElement extends HTMLElement {
grid_properties['backgroundColor'] = style.getPropertyValue('background-color');
grid_properties['color'] = style.getPropertyValue('color');
grid_properties['columnHeaderBackgroundColor'] = header.getPropertyValue('background-color');
grid_properties['columnHeaderSeparatorColor'] = header.getPropertyValue('border-color');
grid_properties['columnHeaderColor'] = header.getPropertyValue('color');
this.grid.addProperties(grid_properties);

Expand Down
20 changes: 10 additions & 10 deletions packages/perspective-viewer-hypergrid/test/results/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"superstore.html/shows a grid without any settings applied.": "2527fc7e3c6dfdbf9082c6543fa579df",
"superstore.html/pivots by a row.": "e027a2a85ce4e09cc165d3a36f57268a",
"superstore.html/pivots by two rows.": "2af0902a97face6099245f27281736de",
"superstore.html/pivots by a row and a column.": "66ee6e38fa6c72eb97113a2809a2870d",
"superstore.html/pivots by two rows and two columns.": "c0dd88cb6c73c2a70f990fec7961781d",
"superstore.html/sorts by a numeric column.": "8ff7b98456146ea02f53a661a88715e9",
"superstore.html/sorts by an alpha column.": "fd4447bbf55250beedbbe086b6262b9a",
"superstore.html/displays visible columns.": "f2c10d79234d039d632e3349a88e4722",
"superstore.html/resets viewable area when the logical size expands.": "786384f5dbf375164e22ca19c4cfeb09",
"superstore.html/pivots by a row.": "9503b08e1a0b0edc9c2e3518596f6873",
"superstore.html/pivots by two rows.": "66f100c65a983dfa37c186185ad70c5d",
"superstore.html/pivots by a row and a column.": "5a38fdf218b20f65a9b45f70ef80c3bc",
"superstore.html/pivots by two rows and two columns.": "e4c88b9789f832fc2954f6df73264bfb",
"superstore.html/sorts by a numeric column.": "e7eb6cc8e7f3449bb599958c63f687a7",
"superstore.html/sorts by an alpha column.": "3485a65a1540a1ef3b3801381cfc61d4",
"superstore.html/displays visible columns.": "eea02565d7bb122bc30756895c5f334c",
"superstore.html/resets viewable area when the logical size expands.": "2110a85755c45a1514b9b8cdc6d2bce6",
"superstore.html/selecting a column does not log a context deleted error.": "2563581d3556c4576745443c8498bea9",
"superstore.html/resets viewable area when the physical size expands.": "2527fc7e3c6dfdbf9082c6543fa579df",
"superstore.html/sorts by a hidden column.": "cf5523dccf01ad9332cc7ce5100e6ad9",
"superstore.html/filters by a numeric column.": "1479e2bb74fd7afb721a7cfa4bac247d"
"superstore.html/sorts by a hidden column.": "863281ce6ea2873c95e72c627e3caa07",
"superstore.html/filters by a numeric column.": "c975691a196a48af12bd53552c7de6e6"
}
36 changes: 24 additions & 12 deletions packages/perspective-viewer/src/html/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,36 @@
<div class="column noselect">
<div id='top_panel'>
<div class="rrow">
<ul id="row_pivots" name="Row Pivots" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<label for="row_pivots">Group by</label>
</ul>
<div id="row_pivots" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<div class="psp-text-field">
<ul class="psp-text-field__input" for="row-pivots"></ul>
<label for="row_pivots"></label>
</div>
</div>
</div>
<span class="rrow centered" style="min-width:5px;max-width:5px;flex-grow:0;color:#999;font-family:Arial;font-size:12px">&#x2715;</span>
<div class="rrow">
<ul id="column_pivots" name="Column Pivots" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<label for="column_pivots">Split by</label>
</ul>
<div id="column_pivots" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<div class="psp-text-field">
<ul class="psp-text-field__input" for="column-pivots"></ul>
<label for="column_pivots"></label>
</div>
</div>
</div>
<div class="rrow">
<ul id="sort" name="Sort" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<label for="sort">Sort</label>
</ul>
<div id="sort" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<div class="psp-text-field">
<ul class="psp-text-field__input" for="sort"></ul>
<label for="sort"></label>
</div>
</div>
</div>
<div class="rrow" style='flex-grow:3;height:auto;flex:1 1 400px;max-width:none'>
<div id="filters" name="Filter" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<label for="sort">Filter</label>
<div id="filters" ondragover="allowDrop(event)" ondragleave="disallowDrop(event)" ondragenter="dragEnter(event)">
<div class="psp-text-field">
<ul class="psp-text-field__input" for='filters'></ul>
<label for="filters"></label>
</div>
</div>
</div>
</div>
Expand All @@ -57,4 +69,4 @@
</div>
</div>

</template>
</template>
Loading