From f997ca41430d3a92b174c2076d460b32e90129f1 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 30 Sep 2010 16:37:32 -0700 Subject: [PATCH] Explicitly Theme front-end controllers --HG-- branch : dev --- src/Orchard.Web/Core/Contents/Controllers/ItemController.cs | 2 ++ src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs | 2 +- src/Orchard.Web/Core/Routable/Controllers/ItemController.cs | 2 ++ .../Modules/Orchard.Blogs/Controllers/BlogController.cs | 2 ++ .../Modules/Orchard.Blogs/Controllers/BlogPostController.cs | 2 ++ .../Modules/Orchard.Search/Controllers/SearchController.cs | 3 ++- .../Modules/Orchard.Setup/Controllers/SetupController.cs | 3 +-- .../Modules/Orchard.Tags/Controllers/HomeController.cs | 3 ++- .../Modules/Orchard.Users/Controllers/AccountController.cs | 3 +-- 9 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs index c1ae20e73..60ccddfe5 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs @@ -1,8 +1,10 @@ using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.DisplayManagement; +using Orchard.Themes; namespace Orchard.Core.Contents.Controllers { + [Themed] public class ItemController : Controller { private readonly IContentManager _contentManager; diff --git a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs index bde60e4a1..3d01f0693 100644 --- a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs +++ b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs @@ -4,9 +4,9 @@ using System.Web.Mvc; using Orchard.Core.Feeds.Models; using Orchard.Logging; using Orchard.Mvc.Results; +using Orchard.Themes; namespace Orchard.Core.Feeds.Controllers { - public class FeedController : Controller { private readonly IEnumerable _feedFormatProviders; private readonly IEnumerable _feedQueryProviders; diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs index b48deb345..e3474a08c 100644 --- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -7,6 +7,7 @@ using Orchard.Core.Routable.Models; using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; +using Orchard.Themes; namespace Orchard.Core.Routable.Controllers { [ValidateInput(false)] @@ -24,6 +25,7 @@ namespace Orchard.Core.Routable.Controllers { dynamic Shape { get; set; } + [Themed] public ActionResult Display(string path) { var matchedPath = _routablePathConstraint.FindPath(path); if (string.IsNullOrEmpty(matchedPath)) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index 662c6b6c8..23754a3ae 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -9,8 +9,10 @@ using Orchard.Blogs.Services; using Orchard.DisplayManagement; using Orchard.Logging; using Orchard.Mvc.Results; +using Orchard.Themes; namespace Orchard.Blogs.Controllers { + [Themed] public class BlogController : Controller { private readonly IOrchardServices _services; private readonly IBlogService _blogService; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs index bc09dc7ff..b99081db3 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs @@ -9,8 +9,10 @@ using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Mvc.Results; using Orchard.Security; +using Orchard.Themes; namespace Orchard.Blogs.Controllers { + [Themed] public class BlogPostController : Controller { private readonly IOrchardServices _services; private readonly IBlogService _blogService; diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index abd4ad485..bd020d368 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -9,9 +9,10 @@ using System.Linq; using System; using System.Collections.Generic; using Orchard.Collections; +using Orchard.Themes; namespace Orchard.Search.Controllers { - [ValidateInput(false)] + [ValidateInput(false), Themed] public class SearchController : Controller { private readonly ISearchService _searchService; private readonly IContentManager _contentManager; diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs index bda6fdd71..f8812fdf7 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs @@ -12,8 +12,7 @@ using Orchard.Themes; using Orchard.UI.Notify; namespace Orchard.Setup.Controllers { - [ValidateInput(false)] - [Themed] + [ValidateInput(false), Themed] public class SetupController : Controller { private readonly IAppDataFolder _appDataFolder; private readonly INotifier _notifier; diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs index 781f8c090..823496464 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs @@ -10,9 +10,10 @@ using Orchard.Security; using Orchard.Settings; using Orchard.Tags.Services; using Orchard.Tags.ViewModels; +using Orchard.Themes; namespace Orchard.Tags.Controllers { - [ValidateInput(false)] + [ValidateInput(false), Themed] public class HomeController : Controller { private readonly ITagService _tagService; private readonly IContentManager _contentManager; diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs index 3d97c2663..c4517ed1f 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs @@ -17,8 +17,7 @@ using Orchard.Users.Models; using Orchard.Mvc.Results; namespace Orchard.Users.Controllers { - [HandleError] - [Themed] + [HandleError, Themed] public class AccountController : Controller { private readonly IAuthenticationService _authenticationService; private readonly IMembershipService _membershipService;