a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: + client: Hide dns autofix warning text 

Squashed commit of the following:

commit e99192ac85400bcce09ca8d73ceef0224f003e0c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Apr 30 16:03:20 2020 +0300

    Show autofix warning conditionally

commit e5658fc3aaee449a49bee76063033dc62e61c722
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 19:18:02 2020 +0300

    + client: Add wiki link on instllation screen
This commit is contained in:
Artem Baskal 2020-04-30 18:59:14 +03:00
parent a702eda9d9
commit 89920bc518
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
client/src/install/Setup/Settings.js
View File

@ -217,19 +217,19 @@ class Settings extends Component {
</div> </div>
<div className="col-12"> <div className="col-12">
{webStatus && {webStatus &&
<div className="setup__error text-danger"> <div className="setup__error text-danger">
{webStatus} {webStatus}
{isWebFixAvailable && {isWebFixAvailable &&
<button <button
type="button" type="button"
className="btn btn-secondary btn-sm ml-2" className="btn btn-secondary btn-sm ml-2"
onClick={() => this.handleAutofix('web')} onClick={() => this.handleAutofix('web')}
> >
<Trans>fix</Trans> <Trans>fix</Trans>
</button> </button>
} }
<hr className="divider--small" /> <hr className="divider--small" />
</div> </div>
} }
</div> </div>
</div> </div>
@ -287,32 +287,33 @@ class Settings extends Component {
</div> </div>
<div className="col-12"> <div className="col-12">
{dnsStatus && {dnsStatus &&
<Fragment> <Fragment>
<div className="setup__error text-danger"> <div className="setup__error text-danger">
{dnsStatus} {dnsStatus}
{isDnsFixAvailable && {isDnsFixAvailable &&
<button <button
type="button" type="button"
className="btn btn-secondary btn-sm ml-2" className="btn btn-secondary btn-sm ml-2"
onClick={() => this.handleAutofix('dns')} onClick={() => this.handleAutofix('dns')}
> >
<Trans>fix</Trans> <Trans>fix</Trans>
</button> </button>
} }
</div> </div>
<div className="text-muted mb-2"> {isDnsFixAvailable &&
<p className="mb-1"> <div className="text-muted mb-2">
<Trans>autofix_warning_text</Trans> <p className="mb-1">
</p> <Trans>autofix_warning_text</Trans>
<Trans components={[<li key="0">text</li>]}> </p>
autofix_warning_list <Trans components={[<li key="0">text</li>]}>
</Trans> autofix_warning_list
<p className="mb-1"> </Trans>
<Trans>autofix_warning_result</Trans> <p className="mb-1">
</p> <Trans>autofix_warning_result</Trans>
</div> </p>
<hr className="divider--small" /> </div>}
</Fragment> <hr className="divider--small" />
</Fragment>
} }
</div> </div>
</div> </div>