Renamed Data recipe builder step to Content.

This commit is contained in:
Sipke Schoorstra
2015-07-15 11:34:57 +01:00
parent 06996f63d0
commit de58b4253d
8 changed files with 22 additions and 22 deletions

View File

@@ -100,7 +100,7 @@ namespace Orchard.ImportExport.Commands {
var recipeBuilderSteps = new List<IRecipeBuilderStep>(); var recipeBuilderSteps = new List<IRecipeBuilderStep>();
if (Metadata || Data) { if (Metadata || Data) {
var dataStep = _orchardServices.WorkContext.Resolve<DataRecipeBuilderStep>(); var dataStep = _orchardServices.WorkContext.Resolve<ContentRecipeBuilderStep>();
if(Data) if(Data)
dataStep.DataContentTypes = exportTypes; dataStep.DataContentTypes = exportTypes;

View File

@@ -8,7 +8,7 @@
var stepName = Html.NameFor(m => m.ExportSteps[exportStepIndex].IsSelected).ToString(); var stepName = Html.NameFor(m => m.ExportSteps[exportStepIndex].IsSelected).ToString();
var stepId = stepName.HtmlClassify(); var stepId = stepName.HtmlClassify();
<fieldset class="export-step export-step-@exportStep.Name.HtmlClassify()"> <fieldset class="recipe-builder-step recipe-builder-step-@exportStep.Name.HtmlClassify()">
<legend> <legend>
<input type="hidden" name="@Html.NameFor(m => m.ExportSteps[exportStepIndex].Name)" value="@Model.ExportSteps[exportStepIndex].Name"/> <input type="hidden" name="@Html.NameFor(m => m.ExportSteps[exportStepIndex].Name)" value="@Model.ExportSteps[exportStepIndex].Name"/>
<input type="checkbox" id="@stepId" name="@stepName" value="true"/> <input type="checkbox" id="@stepId" name="@stepName" value="true"/>

View File

@@ -69,8 +69,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Module.txt" /> <Content Include="Module.txt" />
<Content Include="Scripts\exportstep-data.js" /> <Content Include="Scripts\recipebuilderstep-data.js" />
<Content Include="Styles\exportstep-data.css" /> <Content Include="Styles\recipebuilderstep-content.css" />
<Content Include="Styles\images\menu.importexport.png" /> <Content Include="Styles\images\menu.importexport.png" />
<Content Include="Styles\menu.importexport-admin.css" /> <Content Include="Styles\menu.importexport-admin.css" />
<Content Include="Web.config" /> <Content Include="Web.config" />
@@ -82,7 +82,7 @@
<Compile Include="Models\RecipeStepResultRecord.cs" /> <Compile Include="Models\RecipeStepResultRecord.cs" />
<Compile Include="Models\VersionHistoryOptions.cs" /> <Compile Include="Models\VersionHistoryOptions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RecipeBuilders\DataRecipeBuilderStep.cs" /> <Compile Include="RecipeBuilders\ContentRecipeBuilderStep.cs" />
<Compile Include="RecipeBuilders\RecipeMetadataBuilderStep.cs" /> <Compile Include="RecipeBuilders\RecipeMetadataBuilderStep.cs" />
<Compile Include="RecipeBuilders\SiteSettingsBuilderStep.cs" /> <Compile Include="RecipeBuilders\SiteSettingsBuilderStep.cs" />
<Compile Include="RecipeHandlers\CommandRecipeHandler.cs" /> <Compile Include="RecipeHandlers\CommandRecipeHandler.cs" />
@@ -146,7 +146,7 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" /> <Content Include="Views\EditorTemplates\ExportSteps\Content.cshtml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\RecipeMetadata.cshtml" /> <Content Include="Views\EditorTemplates\ExportSteps\RecipeMetadata.cshtml" />

View File

@@ -10,12 +10,12 @@ using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels; using Orchard.Recipes.ViewModels;
namespace Orchard.Recipes.RecipeBuilders { namespace Orchard.Recipes.RecipeBuilders {
public class DataRecipeBuilderStep : RecipeBuilderStep { public class ContentRecipeBuilderStep : RecipeBuilderStep {
private readonly IContentDefinitionManager _contentDefinitionManager; private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IOrchardServices _orchardServices; private readonly IOrchardServices _orchardServices;
private readonly IContentDefinitionWriter _contentDefinitionWriter; private readonly IContentDefinitionWriter _contentDefinitionWriter;
public DataRecipeBuilderStep( public ContentRecipeBuilderStep(
IContentDefinitionManager contentDefinitionManager, IContentDefinitionManager contentDefinitionManager,
IOrchardServices orchardServices, IOrchardServices orchardServices,
IContentDefinitionWriter contentDefinitionWriter) { IContentDefinitionWriter contentDefinitionWriter) {
@@ -26,11 +26,11 @@ namespace Orchard.Recipes.RecipeBuilders {
} }
public override string Name { public override string Name {
get { return "Data"; } get { return "Content"; }
} }
public override LocalizedString DisplayName { public override LocalizedString DisplayName {
get { return T("Content Items and Definitions"); } get { return T("Content and Content Definitions"); }
} }
public override LocalizedString Description { public override LocalizedString Description {
@@ -64,7 +64,7 @@ namespace Orchard.Recipes.RecipeBuilders {
VersionHistoryOptions = viewModel.VersionHistoryOptions; VersionHistoryOptions = viewModel.VersionHistoryOptions;
} }
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Data", Model: viewModel, Prefix: Prefix); return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Content", Model: viewModel, Prefix: Prefix);
} }
public override void Build(BuildContext context) { public override void Build(BuildContext context) {

View File

@@ -1,9 +0,0 @@
fieldset.export-step-data table.items {
width: 500px;
margin: 0;
}
fieldset.export-step-data table.items td,
fieldset.export-step-data table.items thead tr.sub th {
padding: 0 12px;
}

View File

@@ -0,0 +1,9 @@
fieldset.recipe-builder-step-content table.items {
width: 500px;
margin: 0;
}
fieldset.recipe-builder-step-content table.items td,
fieldset.recipe-builder-step-content table.items thead tr.sub th {
padding: 0 12px;
}

View File

@@ -1,8 +1,8 @@
@model Orchard.Recipes.ViewModels.DataExportStepViewModel @model Orchard.Recipes.ViewModels.DataExportStepViewModel
@{ @{
Style.Include("exportstep-data.css"); Style.Include("recipebuilderstep-content.css");
Script.Require("jQuery"); Script.Require("jQuery");
Script.Include("exportstep-data.js"); Script.Include("recipebuilderstep-data.js");
} }
<div> <div>
<table class="items"> <table class="items">