1
0
mirror of https://github.com/flarum/core.git synced 2025-08-26 09:34:59 +02:00

Compare commits

...

2 Commits

Author SHA1 Message Date
David Sevilla Martin
0035cefa14 Add load previous button to DiscussionList 2021-06-12 11:01:07 -04:00
David Sevilla Martin
a27f540aab Add <hr> page separator to DiscussionList 2021-06-12 11:00:50 -04:00
2 changed files with 29 additions and 6 deletions

View File

@@ -41,13 +41,28 @@ export default class DiscussionList extends Component {
return ( return (
<div className={'DiscussionList' + (state.isSearchResults() ? ' DiscussionList--searchResults' : '')}> <div className={'DiscussionList' + (state.isSearchResults() ? ' DiscussionList--searchResults' : '')}>
{state.hasPrev() && (
<div className="DiscussionList-loadPrev">
{state.isLoadingPrev() ? (
<LoadingIndicator />
) : (
<Button className="Button" onclick={state.loadPrev.bind(state)}>
{app.translator.trans('core.forum.discussion_list.load_prev_button')}
</Button>
)}
</div>
)}
<ul className="DiscussionList-discussions"> <ul className="DiscussionList-discussions">
{state.getPages().map((pg) => { {state.getPages().map((pg) => {
return pg.items.map((discussion) => ( return [
<li key={discussion.id()} data-id={discussion.id()}> <hr key={`page-${pg.number}`} data-page={pg.number} />,
{DiscussionListItem.component({ discussion, params })} ...pg.items.map((discussion) => (
</li> <li key={discussion.id()} data-id={discussion.id()}>
)); {DiscussionListItem.component({ discussion, params })}
</li>
)),
];
})} })}
</ul> </ul>
<div className="DiscussionList-loadMore">{loading}</div> <div className="DiscussionList-loadMore">{loading}</div>

View File

@@ -7,8 +7,12 @@
list-style-type: none; list-style-type: none;
position: relative; position: relative;
} }
.DiscussionList-loadMore {
.DiscussionList-loadMore, .DiscussionList-loadPrev {
text-align: center; text-align: center;
}
.DiscussionList-loadMore {
margin-top: 10px; margin-top: 10px;
.LoadingIndicator-container { .LoadingIndicator-container {
@@ -16,6 +20,10 @@
} }
} }
.DiscussionList-loadPrev .LoadingIndicator-container {
height: 36px;
}
@media @phone { @media @phone {
.DiscussionList { .DiscussionList {
margin: 0 -15px; margin: 0 -15px;