yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated partial view macro engine to support storing the files in the App_Plugins/[packagename]/Views/MacroPartials

Browse Source 
so they can be stored with a package and not pollute the main file system.
This commit is contained in:
Shannon Deminick
2012-12-07 07:04:11 +05:00
parent 0d94ddb96e
commit 2a90e93a6f
6 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web/Mvc/PluginViewEngine.cs
View File

@@ -33,16 +33,16 @@ namespace Umbraco.Web.Mvc
var viewLocationsArray = new[]
{
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.vbhtml")
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.vbhtml")
};
//set all of the area view locations to the plugin folder
AreaViewLocationFormats = viewLocationsArray
.Concat(new[]
{
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.vbhtml")
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.vbhtml")
})
.ToArray();
@@ -51,15 +51,15 @@ namespace Umbraco.Web.Mvc
AreaPartialViewLocationFormats = new[]
{
//will be used when we have partial view and child action macros
string.Concat(Constants.PluginsLocation, "/{2}/Views/Partials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Partials/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/MacroPartials/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/MacroPartials/{0}.vbhtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Partials/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Partials/{0}.vbhtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/MacroPartials/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/MacroPartials/{0}.vbhtml"),
//for partials
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/{1}/{0}.vbhtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(Constants.PluginsLocation, "/{2}/Views/Shared/{0}.vbhtml")
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/{1}/{0}.vbhtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.cshtml"),
string.Concat(SystemDirectories.AppPlugins, "/{2}/Views/Shared/{0}.vbhtml")
};
}