Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

DNN-29429: Fix SMTP Server Tab UI Issue 3.0.x #1124

Merged
merged 2 commits into from
Sep 17, 2019
Merged

DNN-29429: Fix SMTP Server Tab UI Issue 3.0.x #1124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfc640b
DNN-29429: Move horizontal-line div tags after permission checks.
kkadir Aug 22, 2019
27270c7
Merge branch 'release/3.0.x' into bugfix/DNN-29429-fix-smtp-server-ta…
valadas Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions .../Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web/src/components/Tabs/SmtpServer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,35 +198,36 @@ class SmtpServer extends Component {
isGlobal={areGlobalSettings} />
</div>
}
<div className="tooltipAdjustment border-bottom">
{smtpSettingsVisible && credentialVisible &&
<div>
<EditBlock label={localization.get("plSMTPUsername")}
tooltip={localization.get("plSMTPUsername.Help")}
value={selectedSmtpSettings.smtpUserName}
isGlobal={areGlobalSettings}
onChange={this.onChangeField.bind(this, "smtpUserName")}
error={props.errors["smtpUserName"]} />

<EditBlock label={localization.get("plSMTPPassword")}
tooltip={localization.get("plSMTPPassword.Help")}
value={selectedSmtpSettings.smtpPassword}
isGlobal={areGlobalSettings}
type="password"
onChange={this.onChangeField.bind(this, "smtpPassword")}
error={props.errors["smtpPassword"]} />
</div>
}
{smtpSettingsVisible &&
<SwitchBlock label={localization.get("plSMTPEnableSSL")}
onText={localization.get("SwitchOn")}
offText={localization.get("SwitchOff")}
tooltip={localization.get("plSMTPEnableSSL.Help")}
value={selectedSmtpSettings.enableSmtpSsl}
onChange={this.onChangeSmtpEnableSsl.bind(this)}
isGlobal={areGlobalSettings} />
}
</div>
{smtpSettingsVisible && credentialVisible &&
<div className="tooltipAdjustment border-bottom">
<EditBlock label={localization.get("plSMTPUsername")}
tooltip={localization.get("plSMTPUsername.Help")}
value={selectedSmtpSettings.smtpUserName}
isGlobal={areGlobalSettings}
onChange={this.onChangeField.bind(this, "smtpUserName")}
error={props.errors["smtpUserName"]} />

<EditBlock label={localization.get("plSMTPPassword")}
tooltip={localization.get("plSMTPPassword.Help")}
value={selectedSmtpSettings.smtpPassword}
isGlobal={areGlobalSettings}
type="password"
onChange={this.onChangeField.bind(this, "smtpPassword")}
error={props.errors["smtpPassword"]} />
</div>
}
{smtpSettingsVisible &&
<div className="tooltipAdjustment border-bottom">
<SwitchBlock label={localization.get("plSMTPEnableSSL")}
onText={localization.get("SwitchOn")}
offText={localization.get("SwitchOff")}
tooltip={localization.get("plSMTPEnableSSL.Help")}
value={selectedSmtpSettings.enableSmtpSsl}
onChange={this.onChangeSmtpEnableSsl.bind(this)}
isGlobal={areGlobalSettings} />
</div>
}

{smtpSettingsVisible && areGlobalSettings &&
<EditBlock label={localization.get("plHostEmail")}
tooltip={localization.get("plHostEmail.Help")}
Expand Down