From 145ed957c4b4c0aa1b908ed64c6804838aa3ed94 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 29 Sep 2010 16:15:41 -0700 Subject: [PATCH] Adding orchard.experimental and removing orchard.devtools --HG-- branch : dev --- .../Commands/CodeGenerationCommandsTests.cs | 15 ++ .../Commands/ScaffoldingCommands.cs | 211 ------------------ .../Controllers/DatabaseUpdateController.cs | 39 ---- .../Modules/Orchard.DevTools/Module.txt | 22 -- .../ScaffoldingTemplates/Controller.txt | 16 -- .../ScaffoldingTemplates/DataMigration.txt | 18 -- .../ModuleAssemblyInfo.txt | 34 --- .../ScaffoldingTemplates/ModuleCsProj.txt | 130 ----------- .../ScaffoldingTemplates/ModuleManifest.txt | 10 - .../ScaffoldingTemplates/ModuleWebConfig.txt | 23 -- .../Services/ScaffoldingCommandInterpreter.cs | 112 ---------- .../Parts/DevTools.ShowDebugLink.ascx | 6 - .../Parts/DevTools.ShowDebugLink.ascx | 8 - .../Modules/Orchard.DevTools/Views/Web.config | 42 ---- .../AdminMenu.cs | 5 +- .../Commands/ProfilingCommands.cs | 3 +- .../Controllers/CommandsController.cs | 6 +- .../Controllers/ContentController.cs | 6 +- .../Controllers/HomeController.cs | 4 +- .../Controllers/InventoryController.cs | 8 +- .../Controllers/MetadataController.cs | 4 +- .../DebugFilter.cs | 7 +- .../Handlers/DebugLinkHandler.cs | 10 +- .../Models/ShowDebugLink.cs | 4 +- .../Models/Simple.cs | 3 +- .../Modules/Orchard.Experimental/Module.txt | 18 ++ .../Orchard.Experimental.csproj} | 112 ++++------ .../Permissions.cs | 10 +- .../Properties/AssemblyInfo.cs | 7 +- .../Settings/ExperimentalSettings.cs} | 19 +- .../Shapes.cs | 6 +- .../ViewModels/CommandsExecuteViewModel.cs | 6 +- .../ViewModels/ContentDetailsViewModel.cs | 5 +- .../ViewModels/ContentIndexViewModel.cs | 3 +- .../ViewModels/MetadataIndexViewModel.cs | 3 +- .../Views/Commands/Execute.ascx | 2 +- .../Views/Content/Details.aspx | 2 +- .../Views/Content/Index.aspx | 2 +- .../Views/DatabaseUpdate/Index.aspx | 2 +- .../ExperimentalSettings.aspx} | 2 +- .../Parts/Experimental.ShowDebugLink.ascx | 6 + .../Parts/Experimental.ShowDebugLink.ascx | 8 + .../Views/HackScript.cshtml | 0 .../Views/HackStyle.cshtml | 0 .../Views/Home/FormShapes.cshtml | 0 .../Views/Home/Index.aspx | 0 .../Views/Home/Simple.aspx | 2 +- .../Views/Home/UsingShapes.cshtml | 0 .../Views/Home/_RenderableAction.ascx | 0 .../Views/Inventory/ShapeTable.cshtml | 0 .../Views/Metadata/Index.aspx | 4 +- .../Views/ThinBorder.cshtml | 0 .../Views/Web.config} | 9 +- .../Web.config | 2 +- 54 files changed, 166 insertions(+), 810 deletions(-) create mode 100644 src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DatabaseUpdateController.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Module.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Services/ScaffoldingCommandInterpreter.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Views/Web.config rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/AdminMenu.cs (70%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Commands/ProfilingCommands.cs (96%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Controllers/CommandsController.cs (94%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Controllers/ContentController.cs (93%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Controllers/HomeController.cs (95%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Controllers/InventoryController.cs (75%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Controllers/MetadataController.cs (95%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/DebugFilter.cs (93%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Handlers/DebugLinkHandler.cs (67%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Models/ShowDebugLink.cs (53%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Models/Simple.cs (69%) create mode 100644 src/Orchard.Web/Modules/Orchard.Experimental/Module.txt rename src/Orchard.Web/Modules/{Orchard.DevTools/Orchard.DevTools.csproj => Orchard.Experimental/Orchard.Experimental.csproj} (62%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Permissions.cs (72%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Properties/AssemblyInfo.cs (84%) rename src/Orchard.Web/Modules/{Orchard.DevTools/Settings/DevToolsSettings.cs => Orchard.Experimental/Settings/ExperimentalSettings.cs} (57%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Shapes.cs (90%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/ViewModels/CommandsExecuteViewModel.cs (57%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/ViewModels/ContentDetailsViewModel.cs (90%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/ViewModels/ContentIndexViewModel.cs (83%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/ViewModels/MetadataIndexViewModel.cs (86%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Commands/Execute.ascx (89%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Content/Details.aspx (96%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Content/Index.aspx (89%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/DatabaseUpdate/Index.aspx (72%) rename src/Orchard.Web/Modules/{Orchard.DevTools/Views/DefinitionTemplates/DevToolsSettings.ascx => Orchard.Experimental/Views/DefinitionTemplates/ExperimentalSettings.aspx} (82%) create mode 100644 src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/HackScript.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/HackStyle.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Home/FormShapes.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Home/Index.aspx (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Home/Simple.aspx (82%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Home/UsingShapes.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Home/_RenderableAction.ascx (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Inventory/ShapeTable.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/Metadata/Index.aspx (80%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Views/ThinBorder.cshtml (100%) rename src/Orchard.Web/Modules/{Orchard.DevTools/ScaffoldingTemplates/ViewsWebConfig.txt => Orchard.Experimental/Views/Web.config} (85%) rename src/Orchard.Web/Modules/{Orchard.DevTools => Orchard.Experimental}/Web.config (95%) diff --git a/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs new file mode 100644 index 000000000..9af5ea58f --- /dev/null +++ b/src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs @@ -0,0 +1,15 @@ +using NUnit.Framework; +using Orchard.CodeGeneration.Commands; +using Orchard.Environment.Extensions; + +namespace Orchard.Tests.Modules.CodeGeneration.Commands { + [TestFixture] + public class CodeGenerationCommandsTests { + + [Test] + public void CreateDataMigrationTest() { + //ExtensionManager extensionManager = new ExtensionManager(); + //CodeGenerationCommands codeGenerationCommands = new CodeGenerationCommands(); + } + } +} diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs deleted file mode 100644 index 1d5e0c5c8..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs +++ /dev/null @@ -1,211 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Web.Hosting; -using Orchard.Commands; -using Orchard.Data.Migration.Generator; -using Orchard.DevTools.Services; -using Orchard.Environment.Extensions; - -namespace Orchard.DevTools.Commands { - [OrchardFeature("Scaffolding")] - public class ScaffoldingCommands : DefaultOrchardCommandHandler { - private readonly IExtensionManager _extensionManager; - private readonly ISchemaCommandGenerator _schemaCommandGenerator; - - public ScaffoldingCommands( - IExtensionManager extensionManager, - ISchemaCommandGenerator schemaCommandGenerator) { - _extensionManager = extensionManager; - _schemaCommandGenerator = schemaCommandGenerator; - } - - [OrchardSwitch] - public bool IncludeInSolution { get; set; } - - [CommandHelp("scaffolding create datamigration \r\n\t" + "Create a new Data Migration class")] - [CommandName("scaffolding create datamigration")] - public void CreateDataMigration(string featureName) { - Context.Output.WriteLine(T("Creating Data Migration for {0}", featureName)); - - foreach ( var extension in _extensionManager.AvailableExtensions() ) { - if ( extension.ExtensionType == "Module" && extension.Features.Any(f => String.Equals(f.Name, featureName, StringComparison.OrdinalIgnoreCase)) ) { - string dataMigrationsPath = HostingEnvironment.MapPath("~/Modules/" + extension.Name + "/DataMigrations/"); - string dataMigrationPath = dataMigrationsPath + extension.DisplayName + "DataMigration.cs"; - string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/"); - string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extension.Name)); - if ( !Directory.Exists(dataMigrationsPath) ) { - Directory.CreateDirectory(dataMigrationsPath); - } - if ( File.Exists(dataMigrationPath) ) { - Context.Output.WriteLine(T("Data migration already exists in target Module {0}.", extension.Name)); - return; - } - - var commands = _schemaCommandGenerator.GetCreateFeatureCommands(featureName, false).ToList(); - - var stringWriter = new StringWriter(); - var interpreter = new ScaffoldingCommandInterpreter(stringWriter); - - foreach ( var command in commands ) { - interpreter.Visit(command); - stringWriter.WriteLine(); - } - - string dataMigrationText = File.ReadAllText(templatesPath + "DataMigration.txt"); - dataMigrationText = dataMigrationText.Replace("$$FeatureName$$", featureName); - dataMigrationText = dataMigrationText.Replace("$$ClassName$$", extension.DisplayName); - dataMigrationText = dataMigrationText.Replace("$$Commands$$", stringWriter.ToString()); - File.WriteAllText(dataMigrationPath, dataMigrationText); - - string projectFileText = File.ReadAllText(moduleCsProjPath); - // The string searches in solution/project files can be made aware of comment lines. - if ( projectFileText.Contains("\r\n ", "DataMigrations\\" + extension.DisplayName + "DataMigration.cs"); - projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("\r\n \r\n \r\n ", "DataMigrations\\" + extension.DisplayName + "DataMigration.cs"); - projectFileText = projectFileText.Insert(projectFileText.LastIndexOf(""), itemGroupReference); - } - File.WriteAllText(moduleCsProjPath, projectFileText); - TouchSolution(); - Context.Output.WriteLine(T("Data migration created successfully in Module {0}", extension.Name)); - return; - } - } - Context.Output.WriteLine(T("Creating data migration failed: target Feature {0} could not be found.", featureName)); - } - - [CommandHelp("scaffolding create module [/IncludeInSolution:true|false]\r\n\t" + "Create a new Orchard module")] - [CommandName("scaffolding create module")] - [OrchardSwitches("IncludeInSolution")] - public void CreateModule(string moduleName) { - Context.Output.WriteLine(T("Creating Module {0}", moduleName)); - - if ( _extensionManager.AvailableExtensions().Any(extension => extension.ExtensionType == "Module" && String.Equals(moduleName, extension.DisplayName, StringComparison.OrdinalIgnoreCase)) ) { - Context.Output.WriteLine(T("Creating Module {0} failed: a module of the same name already exists", moduleName)); - return; - } - - IntegrateModule(moduleName); - Context.Output.WriteLine(T("Module {0} created successfully", moduleName)); - } - - - [CommandHelp("scaffolding create controller \r\n\t" + "Create a new Orchard controller in a module")] - [CommandName("scaffolding create controller")] - public void CreateController(string moduleName, string controllerName) { - Context.Output.WriteLine(T("Creating Controller {0} in Module {1}", controllerName, moduleName)); - - foreach (var extension in _extensionManager.AvailableExtensions()) { - if (extension.ExtensionType == "Module" && String.Equals(moduleName, extension.DisplayName, StringComparison.OrdinalIgnoreCase)) { - string moduleControllersPath = HostingEnvironment.MapPath("~/Modules/" + extension.Name + "/Controllers/"); - string controllerPath = moduleControllersPath + controllerName + ".cs"; - string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extension.Name)); - string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/"); - if (!Directory.Exists(moduleControllersPath)) { - Directory.CreateDirectory(moduleControllersPath); - } - if (File.Exists(controllerPath)) { - Context.Output.WriteLine(T("Controller {0} already exists in target Module {1}.", controllerName, moduleName)); - return; - } - string controllerText = File.ReadAllText(templatesPath + "Controller.txt"); - controllerText = controllerText.Replace("$$ModuleName$$", moduleName); - controllerText = controllerText.Replace("$$ControllerName$$", controllerName); - File.WriteAllText(controllerPath, controllerText); - string projectFileText = File.ReadAllText(moduleCsProjPath); - // The string searches in solution/project files can be made aware of comment lines. - if (projectFileText.Contains("\r\n ", "Controllers\\" + controllerName + ".cs"); - projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("\r\n \r\n \r\n ", "Controllers\\" + controllerName + ".cs"); - projectFileText = projectFileText.Insert(projectFileText.LastIndexOf(""), itemGroupReference); - } - File.WriteAllText(moduleCsProjPath, projectFileText); - Context.Output.WriteLine(T("Controller {0} created successfully in Module {1}", controllerName, moduleName)); - TouchSolution(); - return; - } - } - Context.Output.WriteLine(T("Creating Controller {0} failed: target Module {1} could not be found.", controllerName, moduleName)); - } - - private void IntegrateModule(string moduleName) { - string rootWebProjectPath = HostingEnvironment.MapPath("~/Orchard.Web.csproj"); - string projectGuid = Guid.NewGuid().ToString().ToUpper(); - - CreateFilesFromTemplates(moduleName, projectGuid); - // The string searches in solution/project files can be made aware of comment lines. - if (IncludeInSolution) { - // Add project to Orchard.sln - string solutionPath = Directory.GetParent(rootWebProjectPath).Parent.FullName + "\\Orchard.sln"; - if (File.Exists(solutionPath)) { - string projectReference = string.Format( - "EndProject\r\nProject(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"{0}\", \"Orchard.Web\\Modules\\{0}\\{0}.csproj\", \"{{{1}}}\"\r\n", - moduleName, projectGuid); - string projectConfiguationPlatforms = string.Format( - "GlobalSection(ProjectConfigurationPlatforms) = postSolution\r\n\t\t{{{0}}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r\n\t\t{{{0}}}.Debug|Any CPU.Build.0 = Debug|Any CPU\r\n\t\t{{{0}}}.Release|Any CPU.ActiveCfg = Release|Any CPU\r\n\t\t{{{0}}}.Release|Any CPU.Build.0 = Release|Any CPU\r\n", - projectGuid); - string solutionText = File.ReadAllText(solutionPath); - solutionText = solutionText.Insert(solutionText.LastIndexOf("EndProject\r\n"), projectReference); - solutionText = solutionText.Replace("GlobalSection(ProjectConfigurationPlatforms) = postSolution\r\n", projectConfiguationPlatforms); - solutionText = solutionText.Insert(solutionText.LastIndexOf("EndGlobalSection"), "\t{" + projectGuid + "} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}\r\n\t"); - - File.WriteAllText(solutionPath, solutionText); - TouchSolution(); - } - else { - Context.Output.WriteLine(T("Warning: Solution file could not be found at {0}", solutionPath)); - } - } - } - - private static void CreateFilesFromTemplates(string moduleName, string projectGuid) { - string modulePath = HostingEnvironment.MapPath("~/Modules/" + moduleName + "/"); - string propertiesPath = modulePath + "Properties"; - string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/"); - - Directory.CreateDirectory(modulePath); - Directory.CreateDirectory(propertiesPath); - Directory.CreateDirectory(modulePath + "Controllers"); - Directory.CreateDirectory(modulePath + "Views"); - File.WriteAllText(modulePath + "\\Views\\Web.config", File.ReadAllText(templatesPath + "ViewsWebConfig.txt")); - Directory.CreateDirectory(modulePath + "Models"); - Directory.CreateDirectory(modulePath + "Scripts"); - - string templateText = File.ReadAllText(templatesPath + "ModuleAssemblyInfo.txt"); - templateText = templateText.Replace("$$ModuleName$$", moduleName); - templateText = templateText.Replace("$$ModuleTypeLibGuid$$", Guid.NewGuid().ToString()); - File.WriteAllText(propertiesPath + "\\AssemblyInfo.cs", templateText); - File.WriteAllText(modulePath + "\\Web.config", File.ReadAllText(templatesPath + "ModuleWebConfig.txt")); - templateText = File.ReadAllText(templatesPath + "ModuleManifest.txt"); - templateText = templateText.Replace("$$ModuleName$$", moduleName); - File.WriteAllText(modulePath + "\\Module.txt", templateText); - templateText = File.ReadAllText(templatesPath + "\\ModuleCsProj.txt"); - templateText = templateText.Replace("$$ModuleName$$", moduleName); - templateText = templateText.Replace("$$ModuleProjectGuid$$", projectGuid); - File.WriteAllText(modulePath + "\\" + moduleName + ".csproj", templateText); - } - - private void TouchSolution() { - string rootWebProjectPath = HostingEnvironment.MapPath("~/Orchard.Web.csproj"); - string solutionPath = Directory.GetParent(rootWebProjectPath).Parent.FullName + "\\Orchard.sln"; - if (!File.Exists(solutionPath)) { - Context.Output.WriteLine(T("Warning: Solution file could not be found at {0}", solutionPath)); - return; - } - - try { - File.SetLastWriteTime(solutionPath, DateTime.Now); - } - catch { - Context.Output.WriteLine(T("An unexpected error occured while trying to refresh the Visual Studio solution. Please reload it.")); - } - } - } -} - diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DatabaseUpdateController.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DatabaseUpdateController.cs deleted file mode 100644 index 68123e8d1..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/DatabaseUpdateController.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Web.Mvc; -using Orchard.Data.Migration.Generator; -using Orchard.Localization; -using Orchard.UI.Admin; -using Orchard.UI.Notify; - -namespace Orchard.DevTools.Controllers { - [ValidateInput(false)] - [Admin] - public class DatabaseUpdateController : Controller { - private readonly ISchemaCommandGenerator _schemaCommandGenerator; - - public DatabaseUpdateController(ISchemaCommandGenerator schemaCommandGenerator, IOrchardServices orchardServices) { - _schemaCommandGenerator = schemaCommandGenerator; - Services = orchardServices; - } - - public IOrchardServices Services { get; set; } - public Localizer T { get; set; } - - public ActionResult Index() { - return View(); - } - - public ActionResult UpdateDatabase() { - try { - - _schemaCommandGenerator.UpdateDatabase(); - Services.Notifier.Information(T("Database updated successfuly")); - } - catch (Exception ex) { - Services.Notifier.Error(T("An error occured while updating the database: {0}", ex.Message)); - } - - return RedirectToAction("Index"); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt deleted file mode 100644 index 838786fb8..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt +++ /dev/null @@ -1,22 +0,0 @@ -name: DevTools -antiforgery: enabled -author: The Orchard Team -website: http://orchardproject.net -version: 0.5.0 -orchardversion: 0.5.0 -description: This module is not activated by default and should only be used in a development environment. It contains various debugging and tracing tools that can display information about your content types. -features: - Orchard.DevTools: - Description: An assortment of debugging tools. - Category: Developer - Scaffolding: - Description: Tools to create Orchard components. - Category: Developer - Dependencies: Orchard.DevTools - Profiling: - Description: Tools to help profile Orchard. - Category: Developer - Dependencies: Orchard.DevTools - Orchard.DevTools.WebCommandLine: - Description: Enables site administrators to execute Orchard.exe commands via web interface - Category: Developer diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt deleted file mode 100644 index 2e1d7a9e4..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt +++ /dev/null @@ -1,16 +0,0 @@ -using System.Web.Mvc; -using Orchard.Localization; -using Orchard; - -namespace $$ModuleName$$.Controllers { - public class $$ControllerName$$ : Controller { - public IOrchardServices Services { get; set; } - - public $$ControllerName$$(IOrchardServices services) { - Services = services; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - } -} diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt deleted file mode 100644 index e80ad786c..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using Orchard.ContentManagement.Drivers; -using Orchard.ContentManagement.MetaData; -using Orchard.ContentManagement.MetaData.Builders; -using Orchard.Core.Contents.Extensions; -using Orchard.Data.Migration; - -namespace $$FeatureName$$.DataMigrations { - public class $$ClassName$$DataMigration : DataMigrationImpl { - - public int Create() { -$$Commands$$ - - return 1; - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt deleted file mode 100644 index 22a4eceba..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt +++ /dev/null @@ -1,34 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("$$ModuleName$$")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Orchard")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("$$ModuleTypeLibGuid$$")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt deleted file mode 100644 index fd2336c8c..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt +++ /dev/null @@ -1,130 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {$$ModuleProjectGuid$$} - {F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - $$ModuleName$$ - $$ModuleName$$ - v4.0 - false - - - 3.5 - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - 3.5 - - - - - - - - False - ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} - Orchard.Framework - - - {9916839C-39FC-4CEB-A5AF-89CA7E87119F} - Orchard.Core - - - - - - - - $(ProjectDir)\..\Manifests - - - - - - - - - - - - False - True - 45979 - / - - - False - True - http://orchard.codeplex.com - False - - - - - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt deleted file mode 100644 index 193964f30..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt +++ /dev/null @@ -1,10 +0,0 @@ -name: $$ModuleName$$ -antiforgery: enabled -author: The Orchard Team -website: http://orchardproject.net -version: 0.5.0 -orchardversion: 0.5.0 -description: Description for the module -features: - $$ModuleName$$: - Description: Description for feature $$ModuleName$$. \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt deleted file mode 100644 index 87bf40af5..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleWebConfig.txt +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Services/ScaffoldingCommandInterpreter.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Services/ScaffoldingCommandInterpreter.cs deleted file mode 100644 index 9bb513cda..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Services/ScaffoldingCommandInterpreter.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System.Collections.Generic; -using System.Data; -using System.IO; -using System.Linq; -using Orchard.Data.Migration.Interpreters; -using Orchard.Data.Migration.Schema; - -namespace Orchard.DevTools.Services { - public class ScaffoldingCommandInterpreter : AbstractDataMigrationInterpreter { - private readonly TextWriter _output; - - public ScaffoldingCommandInterpreter(TextWriter output) { - _output = output; - } - - public override void Visit(CreateTableCommand command) { - _output.WriteLine("\t\t\t// Creating table {0}", command.Name); - _output.WriteLine("\t\t\tSchemaBuilder.CreateTable(\"{0}\", table => table", command.Name); - - - var matchContentPartRecord = command.TableCommands.OfType().Any( - c => - c.IsPrimaryKey - && c.ColumnName == "Id" - && !c.IsIdentity - && c.DbType == DbType.Int32); - - var matchContentPartVersionRecord = matchContentPartRecord && command.TableCommands.OfType().Any( - c => - c.ColumnName == "ContentItemRecord_id" - && c.DbType == DbType.Int32); - - if ( matchContentPartVersionRecord ) { - _output.WriteLine("\t\t\t\t.ContentPartVersionRecord()"); - } - else if ( matchContentPartRecord ) { - _output.WriteLine("\t\t\t\t.ContentPartRecord()"); - } - - foreach ( var createColumn in command.TableCommands.OfType() ) { - if(createColumn.ColumnName == "Id" && matchContentPartRecord) { - continue; - } - - if(createColumn.ColumnName == "ContentItemRecord_id" && matchContentPartVersionRecord) { - continue; - } - - var type = createColumn.DbType.ToString(); - var field = createColumn.ColumnName; - var options = new List(); - - if ( createColumn.IsPrimaryKey ) { - options.Add("PrimaryKey()"); - } - - if ( createColumn.IsIdentity ) { - options.Add("Identity()"); - } - - if ( createColumn.IsUnique ) { - options.Add("Unique()"); - } - - if ( createColumn.IsNotNull ) { - options.Add("NotNull()"); - } - - if ( createColumn.Length.HasValue ) { - if ( createColumn.Length == 10000 ) { - options.Add("Unlimited()"); - } - else { - options.Add(string.Format("WithLength({0})", createColumn.Length)); - } - } - - if ( createColumn.Precision > 0 ) { - options.Add(string.Format("WithPrecision({0})", createColumn.Precision)); - options.Add(string.Format("WithScale({0})", createColumn.Scale)); - } - - _output.WriteLine("\t\t\t\t.Column(\"{0}\", DbType.{1}{2})", field, type, options.Any() ? ", column => column." + string.Join(".", options) : string.Empty); - } - - _output.WriteLine("\t\t\t);"); - - } - - public override void Visit(AlterTableCommand command) { - _output.WriteLine("// Altering table {0}", command.Name); - } - - public override void Visit(DropTableCommand command) { - _output.WriteLine("// Dropping table {0}", command.Name); - _output.WriteLine("\t\t\tSchemaBuilder.DropTable(\"{0}\", command.Name);"); - } - - public override void Visit(SqlStatementCommand command) { - _output.WriteLine("// Executing sql statement\n\n {0}", command.Sql); - } - - public override void Visit(CreateForeignKeyCommand command) { - _output.WriteLine("// Creating foreign key {0}", command.Name); - } - - public override void Visit(DropForeignKeyCommand command) { - _output.WriteLine("// Dropping foreign key {0}", command.Name); - } - - } -} diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx deleted file mode 100644 index 0ff4e2ef6..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DisplayTemplates/Parts/DevTools.ShowDebugLink.ascx +++ /dev/null @@ -1,6 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.DevTools.Models" %> -
<%=T( - "DevTools: displaying {0}", - Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { }) - ) %>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx deleted file mode 100644 index 9cff57c5e..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/EditorTemplates/Parts/DevTools.ShowDebugLink.ascx +++ /dev/null @@ -1,8 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.DevTools.Models" %> -<% if (Model.ContentItem.Id > 0) { %> -
<%=T( - "DevTools: editing {0}", - Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id, Model.ContentItem.Version }, new { }) - ) %>
-<% } %> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Web.config b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Web.config deleted file mode 100644 index 5c6614a80..000000000 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Web.config +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Experimental/AdminMenu.cs similarity index 70% rename from src/Orchard.Web/Modules/Orchard.DevTools/AdminMenu.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/AdminMenu.cs index c3a7cb9b9..2b77d9638 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/AdminMenu.cs @@ -1,7 +1,8 @@ using Orchard.Localization; using Orchard.UI.Navigation; -namespace Orchard.DevTools { +namespace Orchard.Experimental { + public class AdminMenu : INavigationProvider { public string MenuName { get { return "admin"; } } public Localizer T { get; set; } @@ -9,7 +10,7 @@ namespace Orchard.DevTools { public void GetNavigation(NavigationBuilder builder) { builder.Add(T("Site Configuration"), "11", menu => menu - .Add(T("Developer Tools"), "10.0", item => item.Action("Index", "Home", new { area = "Orchard.DevTools" }) + .Add(T("Experimental"), "10.0", item => item.Action("Index", "Home", new { area = "Orchard.Experimental" }) )); } } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Commands/ProfilingCommands.cs similarity index 96% rename from src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Commands/ProfilingCommands.cs index a3b215c76..93f038749 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Commands/ProfilingCommands.cs @@ -7,7 +7,8 @@ using Orchard.Core.Routable.Models; using Orchard.Environment.Extensions; using Orchard.Security; -namespace Orchard.DevTools.Commands { +namespace Orchard.Experimental.Commands { + [OrchardFeature("Profiling")] public class ProfilingCommands : DefaultOrchardCommandHandler { private readonly IContentManager _contentManager; diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/CommandsController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs similarity index 94% rename from src/Orchard.Web/Modules/Orchard.DevTools/Controllers/CommandsController.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs index 910cfaf72..5bb02d8fd 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/CommandsController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/CommandsController.cs @@ -3,13 +3,13 @@ using System.IO; using System.Linq; using System.Web.Mvc; using Orchard.Commands; -using Orchard.DevTools.ViewModels; +using Orchard.Experimental.ViewModels; using Orchard.Environment.Extensions; using Orchard.Themes; using Orchard.UI.Admin; -namespace Orchard.DevTools.Controllers { - [Themed, Admin, OrchardFeature("Orchard.DevTools.WebCommandLine")] +namespace Orchard.Experimental.Controllers { + [Themed, Admin, OrchardFeature("Orchard.Experimental.WebCommandLine")] public class CommandsController : Controller { private readonly ICommandManager _commandManager; diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/ContentController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ContentController.cs similarity index 93% rename from src/Orchard.Web/Modules/Orchard.DevTools/Controllers/ContentController.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ContentController.cs index 27144e368..f159b3e0c 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/ContentController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ContentController.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; using Orchard.Data; -using Orchard.DevTools.ViewModels; +using Orchard.Experimental.ViewModels; using Orchard.ContentManagement; using Orchard.ContentManagement.Records; using Orchard.DisplayManagement; -namespace Orchard.DevTools.Controllers { +namespace Orchard.Experimental.Controllers { public class ContentController : Controller { private readonly IRepository _contentTypeRepository; private readonly IContentManager _contentManager; @@ -34,6 +34,7 @@ namespace Orchard.DevTools.Controllers { var model = new ContentDetailsViewModel { Item = version == null ? _contentManager.Get(id) : _contentManager.Get(id, VersionOptions.Number((int)version)) }; + model.PartTypes = model.Item.ContentItem.Parts .Select(x => x.GetType()) .SelectMany(x => AllTypes(x)) @@ -50,6 +51,7 @@ namespace Orchard.DevTools.Controllers { yield return scan; scan = scan.BaseType; } + foreach (var itf in type.GetInterfaces()) { yield return itf; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs similarity index 95% rename from src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs index eab0b81f4..9c21e0e6d 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/HomeController.cs @@ -1,14 +1,14 @@ using System; using System.Web; using System.Web.Mvc; -using Orchard.DevTools.Models; +using Orchard.Experimental.Models; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Themes; using Orchard.UI.Notify; using Orchard.UI.Admin; -namespace Orchard.DevTools.Controllers { +namespace Orchard.Experimental.Controllers { [Themed] [Admin] public class HomeController : Controller { diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/InventoryController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs similarity index 75% rename from src/Orchard.Web/Modules/Orchard.DevTools/Controllers/InventoryController.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs index 863096119..42cf367c3 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/InventoryController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/InventoryController.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; +using System.Web.Mvc; using Orchard.DisplayManagement.Descriptors; using Orchard.Themes; using Orchard.UI.Admin; -namespace Orchard.DevTools.Controllers { +namespace Orchard.Experimental.Controllers { [Themed, Admin] public class InventoryController : Controller { private readonly IShapeTableManager _shapeTableManager; diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/MetadataController.cs similarity index 95% rename from src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Controllers/MetadataController.cs index 6c8cec838..f27ef9cd5 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Controllers/MetadataController.cs @@ -3,9 +3,9 @@ using System.Web.Mvc; using System.Xml; using System.Xml.Linq; using Orchard.ContentManagement.MetaData; -using Orchard.DevTools.ViewModels; +using Orchard.Experimental.ViewModels; -namespace Orchard.DevTools.Controllers { +namespace Orchard.Experimental.Controllers { [ValidateInput(false)] public class MetadataController : Controller { private readonly IContentDefinitionManager _contentDefinitionManager; diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/DebugFilter.cs b/src/Orchard.Web/Modules/Orchard.Experimental/DebugFilter.cs similarity index 93% rename from src/Orchard.Web/Modules/Orchard.DevTools/DebugFilter.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/DebugFilter.cs index 6eed498db..4537b52f7 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/DebugFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/DebugFilter.cs @@ -7,7 +7,7 @@ using System.Xml; using Orchard.DisplayManagement.Shapes; using Orchard.Mvc.Filters; -namespace Orchard.DevTools { +namespace Orchard.Experimental { public class DebugFilter : FilterProvider, IActionFilter { public void OnActionExecuting(ActionExecutingContext filterContext) { } @@ -39,8 +39,7 @@ namespace Orchard.DevTools { Writer = writer; var model = _viewResultBase.ViewData.Model; Accept(model); - } - finally { + } finally { Writer = null; } } @@ -63,4 +62,4 @@ namespace Orchard.DevTools { } } } -} +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Handlers/DebugLinkHandler.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs similarity index 67% rename from src/Orchard.Web/Modules/Orchard.DevTools/Handlers/DebugLinkHandler.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs index 2e4363886..a180d47af 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Handlers/DebugLinkHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs @@ -1,17 +1,17 @@ using JetBrains.Annotations; using Orchard.ContentManagement.Handlers; -using Orchard.DevTools.Models; +using Orchard.Experimental.Models; -namespace Orchard.DevTools.Handlers { +namespace Orchard.Experimental.Handlers { [UsedImplicitly] public class DebugLinkHandler : ContentHandler { protected override void BuildDisplayShape(BuildDisplayModelContext context) { - var devToolsSettings = context.ContentItem.TypeDefinition.Settings.GetModel(); - if (devToolsSettings.ShowDebugLinks) + var experimentalSettings = context.ContentItem.TypeDefinition.Settings.GetModel(); + if (experimentalSettings.ShowDebugLinks) context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999"); } protected override void BuildEditorShape(BuildEditorModelContext context) { - var devToolsSettings = context.ContentItem.TypeDefinition.Settings.GetModel(); + var devToolsSettings = context.ContentItem.TypeDefinition.Settings.GetModel(); if (devToolsSettings.ShowDebugLinks) context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999"); } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Models/ShowDebugLink.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Models/ShowDebugLink.cs similarity index 53% rename from src/Orchard.Web/Modules/Orchard.DevTools/Models/ShowDebugLink.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Models/ShowDebugLink.cs index 61129e66d..ba076a5a8 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Models/ShowDebugLink.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Models/ShowDebugLink.cs @@ -1,6 +1,6 @@ -using Orchard.ContentManagement; +using Orchard.ContentManagement; -namespace Orchard.DevTools.Models { +namespace Orchard.Experimental.Models { public class ShowDebugLink { public ContentItem ContentItem { get; set; } } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Models/Simple.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Models/Simple.cs similarity index 69% rename from src/Orchard.Web/Modules/Orchard.DevTools/Models/Simple.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Models/Simple.cs index 219d5516c..effa544c8 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Models/Simple.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Models/Simple.cs @@ -1,4 +1,5 @@ -namespace Orchard.DevTools.Models { +namespace Orchard.Experimental.Models { + public class Simple { public string Title { get; set; } public int Quantity { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Module.txt b/src/Orchard.Web/Modules/Orchard.Experimental/Module.txt new file mode 100644 index 000000000..e9607e780 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Module.txt @@ -0,0 +1,18 @@ +Name: Experimental module +antiforgery: enabled +author: The Orchard Team +website: http://orchardproject.net +version: 0.1.0 +orchardversion: 0.6.0 +description: +features: + Profiling: + Description: Tools to help profile Orchard. + Category: Developer + Dependencies: Orchard.Experimental + Orchard.Experimental.WebCommandLine: + Description: Enables site administrators to execute Orchard.exe commands via web interface + Category: Developer + Orchard.Experimental: + Description: An assortment of debugging tools. + Category: Developer \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj similarity index 62% rename from src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj rename to src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj index d6bf0ade2..0aaf24c66 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj @@ -3,21 +3,17 @@ Debug AnyCPU - 9.0.30729 + + 2.0 - {67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + {AB3C207C-0126-4143-8D62-1119DF80D366} + {F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - Orchard.DevTools - Orchard.DevTools + Orchard.Experimental + Orchard.Experimental v4.0 false - - - 3.5 - - true @@ -27,7 +23,6 @@ DEBUG;TRACE prompt 4 - AllRules.ruleset pdbonly @@ -36,46 +31,50 @@ TRACE prompt 4 - AllRules.ruleset - - False + ..\..\..\..\lib\nhprof\HibernatingRhinos.Profiler.Appender.dll + + + + 3.5 - - - - - - - - - + + 3.5 + + + 3.5 + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll + + 3.5 + + + + 3.5 + + - - - - @@ -85,37 +84,34 @@ - - - + - + - - - - - - - - - - + + - - + + + + + + + + + {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} @@ -127,13 +123,14 @@ - - - Designer + + + + @@ -142,20 +139,8 @@ Other similar extension points exist, see Microsoft.Common.targets. --> - - - $(ProjectDir)\..\Manifests - - - - - - + + @@ -163,13 +148,14 @@ False True - 1231 + 55620 / False - True - http://orchard.codeplex.com + False + + False diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Permissions.cs similarity index 72% rename from src/Orchard.Web/Modules/Orchard.DevTools/Permissions.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Permissions.cs index 96b7ff8ac..652ea5c2c 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Permissions.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Permissions.cs @@ -1,13 +1,11 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Web; using Orchard.Environment.Extensions.Models; using Orchard.Security.Permissions; -namespace Orchard.DevTools { +namespace Orchard.Experimental { public class Permissions : IPermissionProvider { - public static readonly Permission DebugShowAllMenuItems = new Permission { Description = "DevTools: Show all menu items", Name = "DebugShowAllMenuItems" }; + public static readonly Permission DebugShowAllMenuItems = new Permission { Description = "Experimental: Show all menu items", Name = "DebugShowAllMenuItems" }; public virtual Feature Feature { get; set; } @@ -22,4 +20,4 @@ namespace Orchard.DevTools { } } -} +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs similarity index 84% rename from src/Orchard.Web/Modules/Orchard.DevTools/Properties/AssemblyInfo.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs index 0be177341..66d87a4fe 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs @@ -1,11 +1,10 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Orchard.DevTools")] +[assembly: AssemblyTitle("Orchard.Experimental")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Orchard")] @@ -19,7 +18,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c185e02c-ccf9-4976-bdaa-1fd7e12c1296")] +[assembly: Guid("dedeaad6-f97c-4db1-b544-8e72496aa5ed")] // Version information for an assembly consists of the following four values: // @@ -31,4 +30,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("0.5.0")] -[assembly: AssemblyFileVersion("0.5.0")] +[assembly: AssemblyFileVersion("0.5.0")] \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Settings/DevToolsSettings.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Settings/ExperimentalSettings.cs similarity index 57% rename from src/Orchard.Web/Modules/Orchard.DevTools/Settings/DevToolsSettings.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Settings/ExperimentalSettings.cs index cb8b46aac..441ede648 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Settings/DevToolsSettings.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Settings/ExperimentalSettings.cs @@ -5,26 +5,25 @@ using Orchard.ContentManagement.MetaData.Builders; using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.ViewModels; -namespace Orchard.DevTools.Settings { - - - public class DevToolsSettings { +namespace Orchard.Experimental.Settings { + + public class ExperimentalSettings { public bool ShowDebugLinks { get; set; } } - public class DevToolsSettingsHooks : ContentDefinitionEditorEventsBase { + public class ExperimentalSettingsHooks : ContentDefinitionEditorEventsBase { public override IEnumerable TypeEditor(ContentTypeDefinition definition) { - var model = definition.Settings.GetModel(); + var model = definition.Settings.GetModel(); yield return DefinitionTemplate(model); } public override IEnumerable TypeEditorUpdate(ContentTypeDefinitionBuilder builder, IUpdateModel updateModel) { - var model = new DevToolsSettings(); - updateModel.TryUpdateModel(model, "DevToolsSettings", null, null); + var model = new ExperimentalSettings(); + updateModel.TryUpdateModel(model, "ExperimentalSettings", null, null); builder - .WithSetting("DevToolsSettings.ShowDebugLinks", model.ShowDebugLinks ? true.ToString() : null); + .WithSetting("ExperimentalSettings.ShowDebugLinks", model.ShowDebugLinks ? true.ToString() : null); yield return DefinitionTemplate(model); } } -} +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs similarity index 90% rename from src/Orchard.Web/Modules/Orchard.DevTools/Shapes.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs index 31284dd31..b2ec4b240 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs @@ -1,9 +1,9 @@ using Orchard.DisplayManagement.Implementation; -namespace Orchard.DevTools { +namespace Orchard.Experimental { public class Shapes : IShapeFactoryEvents { public void Creating(ShapeCreatingContext context) { - + } public void Created(ShapeCreatedContext context) { @@ -15,4 +15,4 @@ namespace Orchard.DevTools { } } } -} +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/CommandsExecuteViewModel.cs b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/CommandsExecuteViewModel.cs similarity index 57% rename from src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/CommandsExecuteViewModel.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/CommandsExecuteViewModel.cs index c1a80a36a..63ff86642 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/CommandsExecuteViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/CommandsExecuteViewModel.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +namespace Orchard.Experimental.ViewModels { -namespace Orchard.DevTools.ViewModels { public class CommandsExecuteViewModel { public string[] History { get; set; } public string CommandLine { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentDetailsViewModel.cs similarity index 90% rename from src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentDetailsViewModel.cs index d94bc21a5..433237c69 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentDetailsViewModel.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using Orchard.ContentManagement; using Orchard.ContentManagement.ViewModels; -using Orchard.UI.Zones; -namespace Orchard.DevTools.ViewModels { +namespace Orchard.Experimental.ViewModels { + public class ContentDetailsViewModel { public IContent Item { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentIndexViewModel.cs similarity index 83% rename from src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentIndexViewModel.cs index 1c014adb9..42ae5e44a 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/ContentIndexViewModel.cs @@ -2,7 +2,8 @@ using Orchard.ContentManagement; using Orchard.ContentManagement.Records; -namespace Orchard.DevTools.ViewModels { +namespace Orchard.Experimental.ViewModels { + public class ContentIndexViewModel { public IEnumerable Types { get; set; } public IEnumerable Items { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/MetadataIndexViewModel.cs similarity index 86% rename from src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs rename to src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/MetadataIndexViewModel.cs index 18c5d30d9..8b07092c8 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/ViewModels/MetadataIndexViewModel.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using Orchard.ContentManagement.MetaData.Models; -namespace Orchard.DevTools.ViewModels { +namespace Orchard.Experimental.ViewModels { + public class MetadataIndexViewModel { public IEnumerable TypeDefinitions { get; set; } public IEnumerable PartDefinitions { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Commands/Execute.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.ascx similarity index 89% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Commands/Execute.ascx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.ascx index 07ed2b98a..beab22bad 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Commands/Execute.ascx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>

<%: Html.TitleForPage(T("Command line").ToString()) %>

diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Details.aspx similarity index 96% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Details.aspx index 1a0afea24..b21baa3aa 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Details.aspx @@ -1,5 +1,5 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.DevTools.ViewModels"%> +<%@ Import Namespace="Orchard.Experimental.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="System.Reflection" %>

<%: Html.TitleForPage(T("{0} Content Type", Model.Item.ContentItem.ContentType).ToString(), T("Content").ToString())%>

diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Index.aspx similarity index 89% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Index.aspx index bf06d24a7..f2c5deb4b 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Content/Index.aspx @@ -1,5 +1,5 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.DevTools.ViewModels"%> +<%@ Import Namespace="Orchard.Experimental.ViewModels"%>

<%: Html.TitleForPage(T("Content").ToString()) %>

<%: T("Content Types")%>

    diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DatabaseUpdate/Index.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DatabaseUpdate/Index.aspx similarity index 72% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/DatabaseUpdate/Index.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/DatabaseUpdate/Index.aspx index 6f49aa6be..19cbc5519 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DatabaseUpdate/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DatabaseUpdate/Index.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage"%> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>

    <%: Html.TitleForPage(T("Data Migration").ToString()) %>

    <%: Html.ActionLink(T("Update Database").ToString(), "UpdateDatabase", "DatabaseUpdate") %>

    diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DefinitionTemplates/DevToolsSettings.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DefinitionTemplates/ExperimentalSettings.aspx similarity index 82% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/DefinitionTemplates/DevToolsSettings.ascx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/DefinitionTemplates/ExperimentalSettings.aspx index ca3f5368c..f0d4add89 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/DefinitionTemplates/DevToolsSettings.ascx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DefinitionTemplates/ExperimentalSettings.aspx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
    <%:Html.EditorFor(m=>m.ShowDebugLinks) %> diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx new file mode 100644 index 000000000..a1ef8d545 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DisplayTemplates/Parts/Experimental.ShowDebugLink.ascx @@ -0,0 +1,6 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Experimental.Models" %> +
    <%=T( + "DevTools: displaying {0}", + Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { }) + ) %>
    diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx new file mode 100644 index 000000000..e5d979e70 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/EditorTemplates/Parts/Experimental.ShowDebugLink.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Experimental.Models" %> +<% if (Model.ContentItem.Id > 0) { %> +
    <%=T( + "DevTools: editing {0}", + Html.ActionLink(T("{0} #{1} v{2}", Model.ContentItem.ContentType, Model.ContentItem.Id, Model.ContentItem.Version).ToString(), "details", "content", new { area = "Orchard.Experimental", Model.ContentItem.Id, Model.ContentItem.Version }, new { }) + ) %>
    +<% } %> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/HackScript.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/HackScript.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/HackScript.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/HackScript.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/HackStyle.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/HackStyle.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/HackStyle.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/HackStyle.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/FormShapes.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/FormShapes.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/FormShapes.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/FormShapes.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/Index.aspx similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/Index.aspx diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Simple.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/Simple.aspx similarity index 82% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Simple.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/Simple.aspx index e65dd1425..46bdd008e 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Simple.aspx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/Simple.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.DevTools.Models" %> +<%@ Import Namespace="Orchard.Experimental.Models" %>

    <%= H(Model.Title) %>

    diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/UsingShapes.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/UsingShapes.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/UsingShapes.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/UsingShapes.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/_RenderableAction.ascx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/_RenderableAction.ascx similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/_RenderableAction.ascx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Home/_RenderableAction.ascx diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Inventory/ShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Inventory/ShapeTable.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Inventory/ShapeTable.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.aspx similarity index 80% rename from src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.aspx index b4859c8f3..c61bdd2fa 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.aspx @@ -1,6 +1,6 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.DevTools.ViewModels" %> +<%@ Import Namespace="Orchard.Experimental.ViewModels" %>