Browse Source

Refactored.

pull/179/head
Halil İbrahim Kalkan 9 years ago
parent
commit
815681fab2
  1. 7
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs
  2. 6
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs
  3. 7
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json
  4. 7
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json
  5. 2
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalBodyTagHelper.cs
  6. 15
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalFooterTagHelper.cs
  7. 6
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalHeaderTagHelper.cs
  8. 2
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalTagHelper.cs
  9. 15
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
  10. 4
      src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json
  11. 2
      src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json
  12. 18
      src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
  13. 2
      src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml
  14. 3
      src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js

7
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs

@ -1,6 +1,8 @@
using System; using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc.Bundling; using Volo.Abp.AspNetCore.Mvc.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource;
using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
@ -18,6 +20,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiBootstrapModule>("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"); options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiBootstrapModule>("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap");
}); });
services.Configure<AbpLocalizationOptions>(options =>
{
options.Resources.AddJson<AbpBootstrapResource>("en");
});
services.Configure<BundlingOptions>(options => services.Configure<BundlingOptions>(options =>
{ {
options.StyleBundles.Add("GlobalStyles", new[] options.StyleBundles.Add("GlobalStyles", new[]

6
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs

@ -0,0 +1,6 @@
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource
{
public class AbpBootstrapResource
{
}
}

7
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json

@ -0,0 +1,7 @@
{
"culture": "en",
"texts": {
"Close": "Close",
"Save": "Save"
}
}

7
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json

@ -0,0 +1,7 @@
{
"culture": "tr",
"texts": {
"Close": "Kapat",
"Save": "Kaydet"
}
}

2
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalBodyTagHelper.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalBodyTagHelper.cs

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Volo.Abp.AspNetCore.Mvc.TagHelpers namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
{ {
public class AbpModalBodyTagHelper : TagHelper public class AbpModalBodyTagHelper : TagHelper
{ {

15
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalFooterTagHelper.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalFooterTagHelper.cs

@ -1,10 +1,19 @@
using System.Text; using System.Text;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource;
namespace Volo.Abp.AspNetCore.Mvc.TagHelpers namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
{ {
public class AbpModalFooterTagHelper : TagHelper public class AbpModalFooterTagHelper : TagHelper
{ {
private readonly IStringLocalizer<AbpBootstrapResource> _localizer;
public AbpModalFooterTagHelper(IStringLocalizer<AbpBootstrapResource> localizer)
{
_localizer = localizer;
}
public override void Process(TagHelperContext context, TagHelperOutput output) public override void Process(TagHelperContext context, TagHelperOutput output)
{ {
output.TagName = "div"; output.TagName = "div";
@ -16,8 +25,8 @@ namespace Volo.Abp.AspNetCore.Mvc.TagHelpers
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine("<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Cancel</button>"); sb.AppendLine("<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">" + _localizer["Close"] + "</button>");
sb.AppendLine("<button type=\"submit\" class=\"btn btn-primary\" id=\"btnUpdateUserSave\">Save</button>"); sb.AppendLine("<button type=\"submit\" class=\"btn btn-primary\" id=\"btnUpdateUserSave\">" + _localizer["Save"] + "</button>");
return sb.ToString(); return sb.ToString();
} }

6
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalHeaderTagHelper.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalHeaderTagHelper.cs

@ -1,10 +1,12 @@
using System.Text; using System.Text;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Volo.Abp.AspNetCore.Mvc.TagHelpers namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
{ {
public class AbpModalHeaderTagHelper : TagHelper public class AbpModalHeaderTagHelper : TagHelper
{ {
public string Title { get; set; }
public override void Process(TagHelperContext context, TagHelperOutput output) public override void Process(TagHelperContext context, TagHelperOutput output)
{ {
output.TagName = "div"; output.TagName = "div";
@ -16,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.TagHelpers
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine(" <h5 class=\"modal-title\">Modal Title</h5>"); sb.AppendLine(" <h5 class=\"modal-title\">" + Title + "</h5>");
sb.AppendLine(" <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">"); sb.AppendLine(" <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">");
sb.AppendLine(" <span aria-hidden=\"true\">&times;</span>"); sb.AppendLine(" <span aria-hidden=\"true\">&times;</span>");
sb.AppendLine(" </button>"); sb.AppendLine(" </button>");

2
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalTagHelper.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalTagHelper.cs

@ -1,7 +1,7 @@
using System.Text; using System.Text;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Volo.Abp.AspNetCore.Mvc.TagHelpers namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
{ {
public class AbpModalTagHelper : TagHelper public class AbpModalTagHelper : TagHelper
{ {

15
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

@ -10,6 +10,21 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="Localization\Resource\en.json" />
<None Remove="Localization\Resource\tr.json" />
</ItemGroup>
<ItemGroup>
<Content Include="Localization\Resource\tr.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Localization\Resource\en.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\Resource\*.json" />
<EmbeddedResource Include="Views\Shared\Components\AbpMenu\Default.cshtml" /> <EmbeddedResource Include="Views\Shared\Components\AbpMenu\Default.cshtml" />
<EmbeddedResource Include="Views\Shared\_AppLayout.cshtml" /> <EmbeddedResource Include="Views\Shared\_AppLayout.cshtml" />
<EmbeddedResource Include="wwwroot\libs\datatables\datatables.css" /> <EmbeddedResource Include="wwwroot\libs\datatables\datatables.css" />

4
src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json

@ -2,7 +2,7 @@
"culture": "en", "culture": "en",
"texts": { "texts": {
"Users": "Users", "Users": "Users",
"CreateUser": "Create user", "NewUser": "New user",
"Actions": "Actions", "Actions": "Actions",
"UserName": "User name", "UserName": "User name",
"EmailAddress": "Email address", "EmailAddress": "Email address",
@ -12,6 +12,6 @@
"Close": "Close", "Close": "Close",
"Save": "Save", "Save": "Save",
"Password": "Password", "Password": "Password",
"UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?" "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?"
} }
} }

2
src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json

@ -2,7 +2,7 @@
"culture": "tr", "culture": "tr",
"texts": { "texts": {
"Users": "Kullanıcılar", "Users": "Kullanıcılar",
"CreateUser": "Kullanıcı oluştur", "NewUser": "Yeni kullanıcı",
"Actions": "İşlemler", "Actions": "İşlemler",
"UserName": "Kullanıcı adı", "UserName": "Kullanıcı adı",
"EmailAddress": "E-posta adresi", "EmailAddress": "E-posta adresi",

18
src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml

@ -7,17 +7,14 @@
Layout = null; Layout = null;
} }
@* TODO: tag helpers tabs *@
<abp-modal> <abp-modal>
<abp-modal-header></abp-modal-header> <abp-modal-header title="@Localizer["NewUser"]"></abp-modal-header>
<abp-modal-body> <abp-modal-body>
<form id="updateUserForm" method="post" asp-page="/Identity/Users/EditModal"> <form method="post" asp-page="/Identity/Users/EditModal">
@* TODO: Remove id when model manager implemented *@
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#EditUser_UserInfoTab" role="tab">@Localizer["UserInformations"]</a> <a class="nav-link active" data-toggle="tab" href="#EditUser_UserInfoTab" role="tab">@Localizer["UserInformations"]</a>
@ -27,7 +24,6 @@
</li> </li>
</ul> </ul>
<!-- Tab panes -->
<div class="tab-content pt-3"> <div class="tab-content pt-3">
<div class="tab-pane active" id="EditUser_UserInfoTab" role="tabpanel"> <div class="tab-pane active" id="EditUser_UserInfoTab" role="tabpanel">
@ -52,10 +48,12 @@
@for (var i = 0; i < Model.Roles.Length; i++) @for (var i = 0; i < Model.Roles.Length; i++)
{ {
<div class="form-check"> <div class="form-check">
<input asp-for="@Model.Roles[i].IsAssigned" class="form-check-input"/> <label asp-for="@Model.Roles[i].IsAssigned" class="form-check-label">
<label asp-for="@Model.Roles[i].IsAssigned">@Model.Roles[i].Name</label> <input asp-for="@Model.Roles[i].IsAssigned" class="form-check-input" />
<input asp-for="@Model.Roles[i].Name"/> @Model.Roles[i].Name
</label>
</div> </div>
<input asp-for="@Model.Roles[i].Name"/>
} }
</div> </div>

2
src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml

@ -1,2 +1,2 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Volo.Abp.AspNetCore.Mvc @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap

3
src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js

@ -4,8 +4,7 @@
var _identityUserAppService = volo.abp.identity.identityUser; var _identityUserAppService = volo.abp.identity.identityUser;
var _editModal = new abp.ModalManager({ var _editModal = new abp.ModalManager({
viewUrl: abp.appPath + 'Identity/Users/EditModal'//, viewUrl: abp.appPath + 'Identity/Users/EditModal'
//scriptUrl: abp.appPath + 'view-resources/Areas/AppAreaName/Views/Users/_CreateOrEditModal.js'
}); });
var _$wrapper = $('#IdentityUsersWrapper'); var _$wrapper = $('#IdentityUsersWrapper');

Loading…
Cancel
Save