lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated Smtp-settings: username/password auto-hide when windows-authentication is selected

Browse Source
This commit is contained in:
Kees Damen
2015-04-25 21:55:30 +02:00
parent c91ff87773
commit 23e773910f
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Shapes/Scripts/base.js
View File

@@ -175,7 +175,7 @@
if (controller.is(":checkbox")) { if (controller.is(":checkbox")) {
controller.click($(this).toggleWhatYouControl).each($(this).toggleWhatYouControl); controller.click($(this).toggleWhatYouControl).each($(this).toggleWhatYouControl);
} else if (controller.is(":radio")) { } else if (controller.is(":radio")) {
$("[name=" + controller.attr("name") + "]").click(function () { $("[name=" + $(this).attr("name") + "]").each($(this).toggleWhatYouControl); }); $("[name='" + controller.attr("name") + "']").click(function () { $("[name='" + $(this).attr("name") + "']").each($(this).toggleWhatYouControl); });
} }
else if (controller.is("option")) { else if (controller.is("option")) {
controller.parent().change(function () { controller.parent().change(function () {

37
src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml
View File

@@ -37,30 +37,33 @@
</div> </div>
<div data-controllerid="@Html.FieldIdFor(m => m.RequireCredentials)"> <div data-controllerid="@Html.FieldIdFor(m => m.RequireCredentials)">
<div> <div>
@Html.RadioButtonFor(m => m.UseDefaultCredentials, false) @Html.RadioButtonFor(m => m.UseDefaultCredentials, false, new { id = "customCredentialsOption", name = "UseDefaultCredentials" })
<label for="@Html.FieldIdFor(m => m.UseDefaultCredentials)" class="forcheckbox">@T("Specify username/password")</label> <label for="customCredentialsOption" class="forcheckbox">@T("Specify username/password")</label>
@Html.ValidationMessage("UseDefaultCredentials", "*") @Html.ValidationMessage("UseDefaultCredentials", "*")
</div> </div>
<div> <div>
<div> <div class="options">
<label for="@Html.FieldIdFor(m => m.UserName)">@T("User name")</label> <span data-controllerid="customCredentialsOption">
@Html.TextBoxFor(m => m.UserName, new { @class = "text" }) <label for="@Html.FieldIdFor(m => m.UserName)">@T("User name")</label>
@Html.ValidationMessage("UserName", "*") @Html.TextBoxFor(m => m.UserName, new { @class = "text" })
<span class="hint">@T("The username for authentication.")</span> @Html.ValidationMessage("UserName", "*")
</div> <span class="hint">@T("The username for authentication.")</span>
<div> </span>
<label for="@Html.FieldIdFor(m => m.Password)">@T("Password")</label> <span data-controllerid="customCredentialsOption">
@Html.TextBoxFor(m => m.Password, new { type = "password", @class = "text medium" }) <label for="@Html.FieldIdFor(m => m.Password)">@T("Password")</label>
@Html.ValidationMessage("Password", "*") @Html.TextBoxFor(m => m.Password, new { type = "password", @class = "text medium" })
<span class="hint">@T("The password for authentication.")</span> @Html.ValidationMessage("Password", "*")
<span class="hint">@T("The password for authentication.")</span>
</span>
</div> </div>
</div> </div>
<div> <div>
@Html.RadioButtonFor(m => m.UseDefaultCredentials, true, new { id = "smtpUseDefaultCredentials" }) @Html.RadioButtonFor(m => m.UseDefaultCredentials, true, new { id = "defaultCredentialsOptions", name = "UseDefaultCredentials" })
<label for="smtpUseDefaultCredentials" class="forcheckbox">@T("Use Windows authentication")</label> <label for="defaultCredentialsOptions" class="forcheckbox">@T("Use Windows authentication")</label>
@Html.ValidationMessage("UseCustomCredentials", "*") @Html.ValidationMessage("UseDefaultCredentials", "*")
<span class="hint">@T("When this option is checked, the aplication pool or host-process identity is used to authenticate with the mail server. ")</span> <span class="hint">@T("When this option is selected, the aplication pool or host-process identity is used to authenticate with the mail server. ")</span>
</div> </div>
</div> </div>
</fieldset> </fieldset>