yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-03 04:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates api for dataset-table-page to include colspan. Component is nested in a tfoot>td and is contained in the table to access contextual properties

Browse Source
This commit is contained in:
Seyi Adebajo 2017-03-28 11:26:09 -07:00 committed by Mars Lan
parent 9e87ca6cd5
commit da0a23e60d
8 changed files with 96 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wherehows-web/app/components/dataset-table-pager.js
View File

@ -8,7 +8,9 @@ const {
} = Ember;
export default Component.extend({
tagName: 'section',
tagName: '',
classNames: ['nacho-pager'],
pages: computed('data', 'limit', function() {
const { data, limit: rowsPerPage = 1 } = getProperties(

18
wherehows-web/app/styles/components/nacho/_nacho-pager.scss Normal file
View File

@ -0,0 +1,18 @@
.nacho-pager {
@include flex-center;
&__section {
@include flex-center;
display: inline-flex;
margin: 0 10px;
}
&__select {
width: 80px;
}
&__desc {
padding: 10px;
margin: 0;
}
}

18
wherehows-web/app/templates/components/dataset-confidential.hbs
View File

@ -53,14 +53,16 @@
{{/each}}
{{/table.body}}
{{#table.foot}}
{{dataset-table-pager data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged}}
{{dataset-table-pager
data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
pagerColSpan=2
onPageChanged=table.onPageChanged}}
{{/table.foot}}
{{/dataset-table}}
</div>

19
wherehows-web/app/templates/components/dataset-schema-table.hbs
View File

@ -48,13 +48,16 @@
{{/each}}
{{/table.body}}
{{#table.foot}}
{{dataset-table-pager data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged}}
{{dataset-table-pager
data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged
pagerColSpan=pagerColSpan
pagerColSpan=5}}
{{/table.foot}}
{{/dataset-table}}

19
wherehows-web/app/templates/components/dataset-table-group-compliance.hbs
View File

@ -40,13 +40,16 @@
{{/each}}
{{/table.body}}
{{#table.foot}}
{{dataset-table-pager data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged}}
{{dataset-table-pager
data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged
pagerSpan=foot.pagerSpan
pagerColSpan=4}}
{{/table.foot}}
{{/dataset-table}}

21
wherehows-web/app/templates/components/dataset-table-org-compliance.hbs
View File

@ -39,14 +39,17 @@
{{/body.row}}
{{/each}}
{{/table.body}}
{{#table.foot}}
{{dataset-table-pager data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged}}
{{#table.foot as |foot|}}
{{dataset-table-pager
data=table.data
page=table.page
limit=table.limit
pageLengths=table.pageLengths
beginOffset=table.beginOffset
endOffset=table.endOffset
onLimitChanged=table.onLimitChanged
onPageChanged=table.onPageChanged
pagerSpan=foot.pagerSpan
pagerColSpan=4}}
{{/table.foot}}
{{/dataset-table}}

46
wherehows-web/app/templates/components/dataset-table-pager.hbs
View File

@ -1,19 +1,33 @@
<article>
<p>Page:</p>
{{ember-selector values=pages selected=page selectionDidChange="changePage"}}
</article>
<td colspan={{pagerColSpan}}>
<section class="nacho-pager">
<span class="nacho-pager__section">
<p class="nacho-pager__desc">Page</p>
{{ember-selector
values=pages
selected=page
class="nacho-pager__select"
selectionDidChange="changePage"}}
</span>
<article>
<p>Rows per page:</p>
{{ember-selector values=pageLengths selected=limit selectionDidChange="changeLimit"}}
</article>
<span class="nacho-pager__section">
<p class="nacho-pager__desc">Rows</p>
{{ember-selector
values=pageLengths
selected=limit
class="nacho-pager__select"
selectionDidChange="changeLimit"}}
</span>
<div>
<button {{action "onDecrementPage"}}>
<i aria-label="Sorting arrow" class="glyphicon glyphicon-arrow-left"></i>
</button>
<span class="nacho-pager__section">
<button class="nacho-button" {{action "onDecrementPage"}}>
<i aria-label="Sorting arrow"
class="glyphicon glyphicon-chevron-left"></i>
</button>
<button {{action "onIncrementPage"}}>
<i aria-label="Sorting arrow" class="glyphicon glyphicon-arrow-right"></i>
</button>
</div>
<button class="nacho-button" {{action "onIncrementPage"}}>
<i aria-label="Sorting arrow"
class="glyphicon glyphicon-chevron-right"></i>
</button>
</span>
</section>
</td>

2
wherehows-web/app/templates/components/dataset-table.hbs
View File

@ -20,4 +20,4 @@
tableRowComponent=tableRowComponent
)
foot=(component tableFooterComponent)
)}}
)}}