remove duplicate column headings

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-03-29 16:26:02 +02:00
parent e5f06bf0aa
commit 6023f69b2e
19 changed files with 19 additions and 19 deletions

View file

@ -47,7 +47,7 @@ class AwaitingApproval extends ImmutablePureComponent {
const showLoading = isLoading && accountIds.count() === 0; const showLoading = isLoading && accountIds.count() === 0;
return ( return (
<Column icon='user' heading={intl.formatMessage(messages.heading)}> <Column icon='user' label={intl.formatMessage(messages.heading)}>
<ScrollableList <ScrollableList
isLoading={isLoading} isLoading={isLoading}
showLoading={showLoading} showLoading={showLoading}

View file

@ -84,7 +84,7 @@ class Dashboard extends ImmutablePureComponent {
if (!account) return null; if (!account) return null;
return ( return (
<Column icon='tachometer-alt' heading={intl.formatMessage(messages.heading)}> <Column icon='tachometer-alt' label={intl.formatMessage(messages.heading)}>
<div className='dashcounters'> <div className='dashcounters'>
{mau && <div className='dashcounter'> {mau && <div className='dashcounter'>
<div> <div>

View file

@ -62,7 +62,7 @@ class ModerationLog extends ImmutablePureComponent {
const showLoading = isLoading && items.count() === 0; const showLoading = isLoading && items.count() === 0;
return ( return (
<Column icon='balance-scale' heading={intl.formatMessage(messages.heading)}> <Column icon='balance-scale' label={intl.formatMessage(messages.heading)}>
<ScrollableList <ScrollableList
isLoading={isLoading} isLoading={isLoading}
showLoading={showLoading} showLoading={showLoading}

View file

@ -64,7 +64,7 @@ class Reports extends ImmutablePureComponent {
const showLoading = isLoading && reports.count() === 0; const showLoading = isLoading && reports.count() === 0;
return ( return (
<Column icon='gavel' heading={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}> <Column icon='gavel' label={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
<ScrollableList <ScrollableList
isLoading={isLoading} isLoading={isLoading}
showLoading={showLoading} showLoading={showLoading}

View file

@ -102,7 +102,7 @@ class UserIndex extends ImmutablePureComponent {
const showLoading = isLoading && accountIds.isEmpty(); const showLoading = isLoading && accountIds.isEmpty();
return ( return (
<Column heading={intl.formatMessage(messages.heading)}> <Column label={intl.formatMessage(messages.heading)}>
<SimpleForm style={{ paddingBottom: 0 }}> <SimpleForm style={{ paddingBottom: 0 }}>
<TextInput <TextInput
onChange={this.handleQueryChange} onChange={this.handleQueryChange}

View file

@ -70,7 +70,7 @@ class Aliases extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.aliases' defaultMessage="You haven't created any account alias yet." />; const emptyMessage = <FormattedMessage id='empty_column.aliases' defaultMessage="You haven't created any account alias yet." />;
return ( return (
<Column className='aliases-settings-panel' icon='suitcase' heading={intl.formatMessage(messages.heading)}> <Column className='aliases-settings-panel' icon='suitcase' label={intl.formatMessage(messages.heading)}>
<ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} /> <ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} />
<Search /> <Search />
{ {

View file

@ -70,7 +70,7 @@ class Backups extends ImmutablePureComponent {
); );
return ( return (
<Column icon='cloud-download' heading={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}> <Column icon='cloud-download' label={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
<ScrollableList <ScrollableList
isLoading={isLoading} isLoading={isLoading}
showLoading={showLoading} showLoading={showLoading}

View file

@ -89,7 +89,7 @@ class Directory extends React.PureComponent {
const { order, local } = this.getParams(this.props, this.state); const { order, local } = this.getParams(this.props, this.state);
return ( return (
<Column icon='address-book-o' heading={intl.formatMessage(messages.title)}> <Column icon='address-book-o' label={intl.formatMessage(messages.title)}>
<div className='directory__filter-form'> <div className='directory__filter-form'>
<div className='directory__filter-form__column' role='group'> <div className='directory__filter-form__column' role='group'>
<RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} /> <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} />

View file

@ -57,7 +57,7 @@ class Blocks extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />; const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
return ( return (
<Column icon='minus-circle' heading={intl.formatMessage(messages.heading)}> <Column icon='minus-circle' label={intl.formatMessage(messages.heading)}>
<ScrollableList <ScrollableList
scrollKey='domain_blocks' scrollKey='domain_blocks'
onLoadMore={this.handleLoadMore} onLoadMore={this.handleLoadMore}

View file

@ -55,7 +55,7 @@ class ExportData extends ImmutablePureComponent {
const { intl } = this.props; const { intl } = this.props;
return ( return (
<Column icon='cloud-download-alt' heading={intl.formatMessage(messages.heading)}> <Column icon='cloud-download-alt' label={intl.formatMessage(messages.heading)}>
<CSVExporter action={exportFollows} messages={followMessages} /> <CSVExporter action={exportFollows} messages={followMessages} />
<CSVExporter action={exportBlocks} messages={blockMessages} /> <CSVExporter action={exportBlocks} messages={blockMessages} />
<CSVExporter action={exportMutes} messages={muteMessages} /> <CSVExporter action={exportMutes} messages={muteMessages} />

View file

@ -53,7 +53,7 @@ class FederationRestrictions extends ImmutablePureComponent {
const emptyMessage = disclosed ? messages.emptyMessage : messages.notDisclosed; const emptyMessage = disclosed ? messages.emptyMessage : messages.notDisclosed;
return ( return (
<Column icon='gavel' heading={intl.formatMessage(messages.heading)}> <Column icon='gavel' label={intl.formatMessage(messages.heading)}>
<div className='explanation-box'> <div className='explanation-box'>
<Accordion <Accordion
headline={intl.formatMessage(messages.boxTitle)} headline={intl.formatMessage(messages.boxTitle)}

View file

@ -135,7 +135,7 @@ class Filters extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.filters' defaultMessage="You haven't created any muted words yet." />; const emptyMessage = <FormattedMessage id='empty_column.filters' defaultMessage="You haven't created any muted words yet." />;
return ( return (
<Column className='filter-settings-panel' icon='filter' heading={intl.formatMessage(messages.heading)}> <Column className='filter-settings-panel' icon='filter' label={intl.formatMessage(messages.heading)}>
<ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} /> <ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} />
<SimpleForm> <SimpleForm>
<div className='filter-settings-panel'> <div className='filter-settings-panel'>

View file

@ -57,7 +57,7 @@ class FollowRequests extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />; const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
return ( return (
<Column icon='user-plus' heading={intl.formatMessage(messages.heading)}> <Column icon='user-plus' labellabel={intl.formatMessage(messages.heading)}>
<ScrollableList <ScrollableList
scrollKey='follow_requests' scrollKey='follow_requests'
onLoadMore={this.handleLoadMore} onLoadMore={this.handleLoadMore}

View file

@ -55,7 +55,7 @@ class ImportData extends ImmutablePureComponent {
const { intl, features } = this.props; const { intl, features } = this.props;
return ( return (
<Column icon='cloud-upload-alt' heading={intl.formatMessage(messages.heading)}> <Column icon='cloud-upload-alt' label={intl.formatMessage(messages.heading)}>
<CSVImporter action={importFollows} messages={followMessages} /> <CSVImporter action={importFollows} messages={followMessages} />
<CSVImporter action={importBlocks} messages={blockMessages} /> <CSVImporter action={importBlocks} messages={blockMessages} />
{features.importMutes && <CSVImporter action={importMutes} messages={muteMessages} />} {features.importMutes && <CSVImporter action={importMutes} messages={muteMessages} />}

View file

@ -63,7 +63,7 @@ class Lists extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.lists' defaultMessage="You don't have any lists yet. When you create one, it will show up here." />; const emptyMessage = <FormattedMessage id='empty_column.lists' defaultMessage="You don't have any lists yet. When you create one, it will show up here." />;
return ( return (
<Column icon='list-ul' heading={intl.formatMessage(messages.heading)}> <Column icon='list-ul' label={intl.formatMessage(messages.heading)}>
<br /> <br />
<ColumnSubheading text={intl.formatMessage(messages.add)} /> <ColumnSubheading text={intl.formatMessage(messages.add)} />
<NewListForm /> <NewListForm />

View file

@ -62,7 +62,7 @@ class Migration extends ImmutablePureComponent {
const { intl } = this.props; const { intl } = this.props;
return ( return (
<Column heading={intl.formatMessage(messages.heading)}> <Column label={intl.formatMessage(messages.heading)}>
<SimpleForm onSubmit={this.handleSubmit}> <SimpleForm onSubmit={this.handleSubmit}>
<fieldset disabled={this.state.isLoading}> <fieldset disabled={this.state.isLoading}>
<FieldsGroup> <FieldsGroup>

View file

@ -52,7 +52,7 @@ class PinnedStatuses extends ImmutablePureComponent {
} }
return ( return (
<Column heading={intl.formatMessage(messages.heading)}> <Column label={intl.formatMessage(messages.heading)}>
<StatusList <StatusList
statusIds={statusIds} statusIds={statusIds}
scrollKey='pinned_statuses' scrollKey='pinned_statuses'

View file

@ -50,7 +50,7 @@ class ScheduledStatuses extends ImmutablePureComponent {
const emptyMessage = <FormattedMessage id='empty_column.scheduled_statuses' defaultMessage="You don't have any scheduled statuses yet. When you add one, it will show up here." />; const emptyMessage = <FormattedMessage id='empty_column.scheduled_statuses' defaultMessage="You don't have any scheduled statuses yet. When you add one, it will show up here." />;
return ( return (
<Column icon='calendar' heading={intl.formatMessage(messages.heading)}> <Column icon='calendar' label={intl.formatMessage(messages.heading)}>
<ScrollableList <ScrollableList
scrollKey='scheduled_statuses' scrollKey='scheduled_statuses'
emptyMessage={emptyMessage} emptyMessage={emptyMessage}

View file

@ -28,7 +28,7 @@ class ServerInfo extends ImmutablePureComponent {
const { intl, instance } = this.props; const { intl, instance } = this.props;
return ( return (
<Column icon='info' heading={intl.formatMessage(messages.heading)}> <Column icon='info' label={intl.formatMessage(messages.heading)}>
<div className='info_column_area'> <div className='info_column_area'>
<div className='info__brand'> <div className='info__brand'>
<div className='brand'> <div className='brand'>