Browse Source

Removed temporary page.

pull/129/head
Halil İbrahim Kalkan 9 years ago
parent
commit
68e7900bbf
  1. 8
      src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
  2. 11
      src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
  3. 6
      src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
  4. 12
      src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs
  5. 23
      src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
  6. 3
      src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml
  7. 6
      src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

8
src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs

@ -22,10 +22,12 @@ namespace AbpDesk.Web.Mvc.Navigation
.AddItem( .AddItem(
new ApplicationMenuItem("TicketManagement.Tickets", "Tickets", url: "/Tickets") new ApplicationMenuItem("TicketManagement.Tickets", "Tickets", url: "/Tickets")
) )
)
.AddItem(
new ApplicationMenuItem("Blog", "Blog", url: "/Blog/Posts")
); );
//Disabled blog module. This should be inside the module!
//.AddItem(
// new ApplicationMenuItem("Blog", "Blog", url: "/Blog/Posts")
//);
return Task.CompletedTask; return Task.CompletedTask;
} }

11
src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs

@ -28,12 +28,13 @@ namespace AbpDesk.Web.Mvc
/* @halil: I added Abp.MongoDb package as a dependency to the main application in order to use the blog plugin. /* @halil: I added Abp.MongoDb package as a dependency to the main application in order to use the blog plugin.
* Otherwise, we should add all dependencies (Recursively) into plugin folder * Otherwise, we should add all dependencies (Recursively) into plugin folder
* and load in correct order. We should carefully think on that problem in the future. * and load in correct order. We should carefully think on that problem in the future.
* NOTE: Disabled
*/ */
options.PlugInSources.AddFolder( //options.PlugInSources.AddFolder(
Path.Combine( // Path.Combine(
_env.ContentRootPath, // _env.ContentRootPath,
@"../Web_PlugIns/") // @"../Web_PlugIns/")
); //);
}); });
//TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory!

6
src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs

@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc.Bundling; using Volo.Abp.AspNetCore.Mvc.Bundling;
using Volo.Abp.EmbeddedFiles; using Volo.Abp.EmbeddedFiles;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.Ui.Navigation;
namespace Volo.Abp.AspNetCore.Mvc namespace Volo.Abp.AspNetCore.Mvc
{ {
@ -15,11 +14,6 @@ namespace Volo.Abp.AspNetCore.Mvc
{ {
services.AddAssemblyOf<AbpAspNetCoreMvcUiModule>(); services.AddAssemblyOf<AbpAspNetCoreMvcUiModule>();
services.Configure<NavigationOptions>(options =>
{
options.MenuContributors.Add(new EmbeddedDemoMainMenuContributor());
});
services.Configure<EmbeddedFileOptions>(options => services.Configure<EmbeddedFileOptions>(options =>
{ {
options.Sources.Add( options.Sources.Add(

12
src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs

@ -1,12 +0,0 @@
using Microsoft.AspNetCore.Mvc;
namespace Volo.Abp.AspNetCore.Mvc.Controllers
{
public class AbpEmbeddedDemoController : AbpController
{
public ActionResult Index()
{
return View();
}
}
}

23
src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs

@ -1,23 +0,0 @@
using System.Threading.Tasks;
using Volo.Abp.Ui.Navigation;
namespace Volo.Abp.AspNetCore.Mvc
{
public class EmbeddedDemoMainMenuContributor : IMenuContributor
{
public Task ConfigureMenuAsync(MenuConfigurationContext context)
{
if (context.Menu.Name != StandardMenus.Main)
{
return Task.CompletedTask;
}
context.Menu
.AddItem(
new ApplicationMenuItem("EmbeddedDemo", "EmbeddedDemo", url: "/AbpEmbeddedDemo")
);
return Task.CompletedTask;
}
}
}

3
src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml

@ -1,3 +0,0 @@
<h2>ABP Embedded Demo Page</h2>
<p>This page's content is stored as an embedded file!</p>

6
src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

@ -11,7 +11,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Views\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" /> <EmbeddedResource Include="Views\Shared\Components\AbpMenu\AbpMenuViewComponent.cs" />
<EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\AbpStyleBundleViewComponent.cs" />
<EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\Default.cshtml" />
<EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\AbpStyleBundleViewComponent.cs" />
<EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\Default.cshtml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

Loading…
Cancel
Save