Commit 21787dfd authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'jsalyers-list-style-update' into 'develop'

[JES] Updates to fix some styling issues with blacklisting page

See merge request !166
parents e7227128 33a70adf
...@@ -345,7 +345,7 @@ class ListManagement extends React.Component { ...@@ -345,7 +345,7 @@ class ListManagement extends React.Component {
} }
this.setState({ this.setState({
is_busy: false, is_busy: false,
validate_accounts: [], validated_accounts: [],
unmatched_accounts: [], unmatched_accounts: [],
updates_are_pending: true, updates_are_pending: true,
}); });
...@@ -409,7 +409,7 @@ class ListManagement extends React.Component { ...@@ -409,7 +409,7 @@ class ListManagement extends React.Component {
for (var account of listed_accounts) { for (var account of listed_accounts) {
let item = ( let item = (
<tr key={account.name + 'tr'}> <tr key={account.name + 'tr'}>
<td style={{ width: '75%' }}> <td style={{ width: '75%', whiteSpace: 'nowrap' }}>
<Link to={'/@' + account.name}> <Link to={'/@' + account.name}>
<strong>{account.name}</strong> <strong>{account.name}</strong>
</Link> </Link>
...@@ -432,7 +432,10 @@ class ListManagement extends React.Component { ...@@ -432,7 +432,10 @@ class ListManagement extends React.Component {
</td> </td>
<td> <td>
<span <span
style={{ display: show_button }} style={{
display: show_button,
whiteSpace: 'nowrap',
}}
className="button slim hollow secondary" className="button slim hollow secondary"
onClick={this.handle_unlist.bind( onClick={this.handle_unlist.bind(
this, this,
...@@ -808,53 +811,83 @@ class ListManagement extends React.Component { ...@@ -808,53 +811,83 @@ class ListManagement extends React.Component {
)} )}
</b> </b>
</h5> </h5>
<table style={{ width: '35%' }}> <h6>
<thead /> {tt('list_management_jsx.multi_add_notes')}
<tbody> </h6>
<tr> <center>
<td <table style={{ width: '35%' }}>
style={{ <thead />
width: '50%', <tbody>
textAlign: 'right', <tr>
}} <td
> style={{
{add_to_text}{' '} whiteSpace: 'nowrap',
{tt(
'list_management_jsx.multi_add_notes'
)}
</td>
<td style={{ width: '25%' }}>
<input
type="text"
name="multiadd"
ref={el =>
(this.multiadd = el)
}
onChange={e => {
this.validate_accounts_to_add(
e.target.value
);
}} }}
/> >
</td> <center>
<input
<td style={{ width: '25%' }}> style={{
{this.state.validated_accounts width: '60%',
.length > 0 && ( whiteSpace:
<span 'nowrap',
className="button slim hollow secondary" }}
onClick={ type="text"
this name="multiadd"
.broadcastFollowOperation ref={el =>
} (this.multiadd = el)
> }
{button_text} onChange={e => {
</span> this.validate_accounts_to_add(
e.target
.value
);
}}
/>
</center>
</td>
</tr>
<tr>
<td
style={{
width: '60%',
whiteSpace: 'nowrap',
}}
>
<center>
{this.state
.validated_accounts
.length > 0 && (
<span
className="button slim hollow secondary"
onClick={
this
.broadcastFollowOperation
}
>
{button_text}
</span>
)}
</center>
</td>
</tr>
</tbody>
</table>
{this.state.unmatched_accounts.length >
0 && (
<div style={{ color: 'red' }}>
<b>
{tt(
'list_management_jsx.unknown_accounts'
)}{' '}
{this.state.unmatched_accounts.join(
', '
)} )}
</td> </b>
</tr> </div>
</tbody> )}
</table> </center>
</div> </div>
)} )}
...@@ -905,14 +938,6 @@ class ListManagement extends React.Component { ...@@ -905,14 +938,6 @@ class ListManagement extends React.Component {
: reset_all_button_text} : reset_all_button_text}
</span> </span>
{this.state.unmatched_accounts.length > 0 && (
<div style={{ color: 'red' }}>
<b>
{tt('list_management_jsx.unknown_accounts')}{' '}
{this.state.unmatched_accounts.join(', ')}
</b>
</div>
)}
{this.state.updates_are_pending && ( {this.state.updates_are_pending && (
<div style={{ color: 'red' }}> <div style={{ color: 'red' }}>
<b> <b>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment