tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

reverted some changes to not break class signatures

pull/5331/head
Maik Stegemann 6 years ago
parent
4ec1281b00
commit
c9d18ab484
2 changed files with 47 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs
  2. 73
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs

19
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Breadcrumb/AbpBreadcrumbItemTagHelperService.cs
View File

@ -25,8 +25,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
var list = context.GetValue<List<BreadcrumbItem>>(BreadcrumbItemsContent); var list = context.GetValue<List<BreadcrumbItem>>(BreadcrumbItemsContent);
ProcessContent(context, output); output.Content.SetHtmlContent(GetInnerHtml(context, output));
list.Add(new BreadcrumbItem list.Add(new BreadcrumbItem
{ {
Html = output.Render(_encoder), Html = output.Render(_encoder),
@ -36,21 +36,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Breadcrumb
output.SuppressOutput(); output.SuppressOutput();
} }
protected virtual void ProcessContent(TagHelperContext context, TagHelperOutput output) protected virtual string GetInnerHtml(TagHelperContext context, TagHelperOutput output)
{ {
if (string.IsNullOrWhiteSpace(TagHelper.Href)) if (string.IsNullOrWhiteSpace(TagHelper.Href))
{ {
output.Attributes.Add("aria-current", "page"); output.Attributes.Add("aria-current", "page");
output.Content.Append(TagHelper.Title); return _encoder.Encode(TagHelper.Title);
} }
else
{
var link = new TagBuilder("a");
link.Attributes.Add("href", TagHelper.Href);
link.InnerHtml.Append(TagHelper.Title);
output.Content.AppendHtml(link); var link = new TagBuilder("a");
} link.Attributes.Add("href", TagHelper.Href);
link.InnerHtml.Append(TagHelper.Title);
return RenderHtml(link);
} }
} }
} }

73
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
View File

@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using System.Text;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
@ -22,37 +23,41 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
if (TagHelper.Buttons != AbpModalButtons.None) if (TagHelper.Buttons != AbpModalButtons.None)
{ {
ProcessButtons(context, output); output.PostContent.SetHtmlContent(CreateContent());
} }
ProcessButtonsAlignment(output); ProcessButtonsAlignment(output);
} }
protected virtual void ProcessButtons(TagHelperContext context, TagHelperOutput output) protected virtual string CreateContent()
{ {
var sb = new StringBuilder();
switch (TagHelper.Buttons) switch (TagHelper.Buttons)
{ {
case AbpModalButtons.Cancel: case AbpModalButtons.Cancel:
AddCancelButton(context, output); sb.AppendLine(GetCancelButton());
break; break;
case AbpModalButtons.Close: case AbpModalButtons.Close:
AddCloseButton(context, output); sb.AppendLine(GetCloseButton());
break; break;
case AbpModalButtons.Save: case AbpModalButtons.Save:
AddSaveButton(context, output); sb.AppendLine(GetSaveButton());
break; break;
case AbpModalButtons.Save | AbpModalButtons.Cancel: case AbpModalButtons.Save | AbpModalButtons.Cancel:
AddSaveButton(context, output); sb.AppendLine(GetSaveButton());
AddCancelButton(context, output); sb.AppendLine(GetCancelButton());
break; break;
case AbpModalButtons.Save | AbpModalButtons.Close: case AbpModalButtons.Save | AbpModalButtons.Close:
AddSaveButton(context, output); sb.AppendLine(GetSaveButton());
AddCloseButton(context, output); sb.AppendLine(GetCloseButton());
break; break;
} }
return sb.ToString();
} }
protected virtual void AddSaveButton(TagHelperContext context, TagHelperOutput output) protected virtual string GetSaveButton()
{ {
var icon = new TagBuilder("i"); var icon = new TagBuilder("i");
icon.AddCssClass("fa"); icon.AddCssClass("fa");
@ -61,39 +66,39 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
var span = new TagBuilder("span"); var span = new TagBuilder("span");
span.InnerHtml.Append(_localizer["Save"]); span.InnerHtml.Append(_localizer["Save"]);
var button = new TagBuilder("button"); var element = new TagBuilder("button");
button.Attributes.Add("type", "submit"); element.Attributes.Add("type", "submit");
button.AddCssClass("btn"); element.AddCssClass("btn");
button.AddCssClass("btn-primary"); element.AddCssClass("btn-primary");
button.Attributes.Add("data-busy-text", _localizer["SavingWithThreeDot"]); element.Attributes.Add("data-busy-text", _localizer["SavingWithThreeDot"]);
button.InnerHtml.AppendHtml(icon); element.InnerHtml.AppendHtml(icon);
button.InnerHtml.AppendHtml(span); element.InnerHtml.AppendHtml(span);
output.PostContent.AppendHtml(button); return RenderHtml(element);
} }
protected virtual void AddCloseButton(TagHelperContext context, TagHelperOutput output) protected virtual string GetCloseButton()
{ {
var button = new TagBuilder("button"); var element = new TagBuilder("button");
button.Attributes.Add("type", "button"); element.Attributes.Add("type", "button");
button.Attributes.Add("data-dismiss", "modal"); element.Attributes.Add("data-dismiss", "modal");
button.AddCssClass("btn"); element.AddCssClass("btn");
button.AddCssClass("btn-secondary"); element.AddCssClass("btn-secondary");
button.InnerHtml.Append(_localizer["Close"]); element.InnerHtml.Append(_localizer["Close"]);
output.PostContent.AppendHtml(button); return RenderHtml(element);
} }
protected virtual void AddCancelButton(TagHelperContext context, TagHelperOutput output) protected virtual string GetCancelButton()
{ {
var button = new TagBuilder("button"); var element = new TagBuilder("button");
button.Attributes.Add("type", "button"); element.Attributes.Add("type", "button");
button.Attributes.Add("data-dismiss", "modal"); element.Attributes.Add("data-dismiss", "modal");
button.AddCssClass("btn"); element.AddCssClass("btn");
button.AddCssClass("btn-secondary"); element.AddCssClass("btn-secondary");
button.InnerHtml.Append(_localizer["Cancel"]); element.InnerHtml.Append(_localizer["Cancel"]);
output.PostContent.AppendHtml(button); return RenderHtml(element);
} }
protected virtual void ProcessButtonsAlignment(TagHelperOutput output) protected virtual void ProcessButtonsAlignment(TagHelperOutput output)

Write Preview
Loading…
Cancel
Save