lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 01:57:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Forgot the rest of the files from the last checkin

Browse Source 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Navigation/Services/MainMenuFilter.cs => src/Orchard.Web/Core/Navigation/Filters/MainMenuFilter.cs
rename : src/Orchard.Web/Core/Navigation/ViewModels/NavigationIndexViewModel.cs => src/Orchard.Web/Core/Navigation/ViewModels/NavigationManagementViewModel.cs
This commit is contained in:
Erik Porter
2010-02-12 13:08:41 -08:00
parent dcb4eb478c
commit 1b6df7a085
8 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

@@ -1,21 +1,26 @@
using System.Web.Mvc;
using Orchard.Core.Navigation.ViewModels;
using Orchard.Localization;
using Orchard.UI.Navigation;
namespace Orchard.Core.Navigation.Controllers {
[ValidateInput(false)]
public class AdminController : Controller {
public IOrchardServices Services { get; private set; }
private readonly IOrchardServices _services;
private readonly INavigationManager _navigationManager;
public AdminController(IOrchardServices services) {
Services = services;
public AdminController(IOrchardServices services, INavigationManager navigationManager) {
_services = services;
_navigationManager = navigationManager;
T = NullLocalizer.Instance;
}
public Localizer T { get; set; }
public ActionResult Index() {
return View(new NavigationIndexViewModel());
var model = new NavigationManagementViewModel {Menu = _navigationManager.BuildMenu("main")};
return View(model);
}
}
}

7
src/Orchard.Web/Core/Navigation/Services/MainMenuFilter.cs → src/Orchard.Web/Core/Navigation/Filters/MainMenuFilter.cs
View File

@@ -3,7 +3,7 @@ using Orchard.Mvc.Filters;
using Orchard.Mvc.ViewModels;
using Orchard.UI.Navigation;
namespace Orchard.Core.Navigation.Services {
namespace Orchard.Core.Navigation.Filters {
public class MainMenuFilter : FilterProvider, IResultFilter {
private readonly INavigationManager _navigationManager;
@@ -20,11 +20,10 @@ namespace Orchard.Core.Navigation.Services {
if (baseViewModel == null)
return;
baseViewModel.Menu = _navigationManager.BuildMenu("mainmenu");
baseViewModel.Menu = _navigationManager.BuildMenu("main");
}
public void OnResultExecuted(ResultExecutedContext filterContext) {
}
}
}
}

2
src/Orchard.Web/Core/Navigation/Services/MainMenu.cs
View File

@@ -13,7 +13,7 @@ namespace Orchard.Core.Navigation.Services {
_contentManager = contentManager;
}
public string MenuName { get { return "mainmenu"; } }
public string MenuName { get { return "main"; } }
public void GetNavigation(NavigationBuilder builder) {
IEnumerable<MenuPart> menuParts = _contentManager.Query<MenuPart, MenuPartRecord>().Where(x => x.OnMainMenu).List();

2
src/Orchard.Web/Core/Navigation/ViewModels/NavigationIndexViewModel.cs → src/Orchard.Web/Core/Navigation/ViewModels/NavigationManagementViewModel.cs
View File

@@ -1,6 +1,6 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Navigation.ViewModels {
public class NavigationIndexViewModel : AdminViewModel {
public class NavigationManagementViewModel : AdminViewModel {
}
}

16
src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<NavigationIndexViewModel>" %>
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<NavigationManagementViewModel>" %>
<%@ Import Namespace="Orchard.Core.Navigation.ViewModels"%>
<h1><%=Html.TitleForPage(T("Edit Main Menu").ToString())%></h1><%
using (Html.BeginFormAntiForgeryPost()) { %>
@@ -11,15 +11,15 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<td></td>
</tr>
</thead>
<tbody>
<%-- loop over menu items --%>
<tbody><%
foreach (var menuItem in Model.Menu) { %>
<tr>
<td><input type="text" name="text" /></td>
<td><input type="text" name="position" /></td>
<td><input type="text" name="url" /></td>
<td><%=Html.TextBox("text", menuItem.Text) %></td>
<td><%=Html.TextBox("position", menuItem.Position) %></td>
<td><%=Html.TextBox("url", menuItem.Url) %></td>
<td>Delete Button</td>
</tr>
<%-- end loop --%>
</tr><%
} %>
<tr>
<td></td>
<td></td>

4
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -114,8 +114,8 @@
<Compile Include="Navigation\Records\MenuItemRecord.cs" />
<Compile Include="Navigation\Records\MenuPartRecord.cs" />
<Compile Include="Navigation\Services\MainMenu.cs" />
<Compile Include="Navigation\Services\MainMenuFilter.cs" />
<Compile Include="Navigation\ViewModels\NavigationIndexViewModel.cs" />
<Compile Include="Navigation\Filters\MainMenuFilter.cs" />
<Compile Include="Navigation\ViewModels\NavigationManagementViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Scheduling\Records\ScheduledTaskRecord.cs" />
<Compile Include="Scheduling\Services\PublishingTaskHandler.cs" />

1
src/Orchard/Orchard.csproj
View File

@@ -283,6 +283,7 @@
<Compile Include="Mvc\ViewEngines\WebFormsViewEngineProvider.cs" />
<Compile Include="Mvc\ViewModels\AdminViewModel.cs" />
<Compile Include="Mvc\ViewModels\BaseViewModel.cs" />
<Compile Include="UI\Navigation\INavigationManager.cs" />
<Compile Include="UI\PageClass\IPageClassBuilder.cs" />
<Compile Include="UI\PageClass\PageClassBuilder.cs" />
<Compile Include="UI\PageTitle\IPageTitleBuilder.cs" />

8
src/Orchard/UI/Navigation/NavigationManager.cs
View File

@@ -1,16 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Orchard.Security;
using Orchard.Security.Permissions;
namespace Orchard.UI.Navigation {
public interface INavigationManager : IDependency {
IEnumerable<MenuItem> BuildMenu(string menuName);
}
public class NavigationManager : INavigationManager {
private readonly IEnumerable<INavigationProvider> _providers;
private readonly IAuthorizationService _authorizationService;