lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source
This commit is contained in:
Daniel Stolt
2015-08-16 18:02:29 +01:00
parent 3183df5b4a 4b44827f2a
commit 6228f4e8fb
6 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssetsJson.txt Normal file
View File

@@ -0,0 +1,6 @@
[
{
"inputs": [ "Assets/Styles.less" ],
"output": "Styles/Styles.css"
}
]

2
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesCss.txt Normal file
View File

@@ -0,0 +1,2 @@

/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJTdHlsZXMuY3NzIiwic291cmNlc0NvbnRlbnQiOltdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== */

2
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesLess.txt Normal file
View File

@@ -0,0 +1,2 @@
body {
}

1
src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesMinCss.txt Normal file
View File

@@ -0,0 +1 @@


22
src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
View File

@@ -21,10 +21,10 @@ namespace Orchard.CodeGeneration.Commands {
private const string SolutionDirectoryThemes = "74492CBC-7201-417E-BC29-28B4C25A58B0";
private static readonly string[] _themeDirectories = new[] {
"", "Content", "Styles", "Scripts", "Views"
"", "Assets", "Content", "Styles", "Scripts", "Views"
};
private static readonly string[] _moduleDirectories = new[] {
"", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
"", "Properties", "Assets", "Controllers", "Views", "Models", "Scripts", "Styles"
};
private static readonly string[] _moduleTestsDirectories = new[] {
"", "Properties"
@@ -281,6 +281,15 @@ namespace Orchard.CodeGeneration.Commands {
}
}
File.WriteAllText(modulePath + "Assets.json", File.ReadAllText(_codeGenTemplatePath + "ModuleAssetsJson.txt"));
content.Add(modulePath + "Assets.json");
File.WriteAllText(modulePath + "Assets\\Styles.less", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesLess.txt"));
content.Add(modulePath + "Assets\\Styles.less");
File.WriteAllText(modulePath + "Styles\\Styles.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesCss.txt"));
content.Add(modulePath + "Styles\\Styles.css");
File.WriteAllText(modulePath + "Styles\\Styles.min.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesMinCss.txt"));
content.Add(modulePath + "Styles\\Styles.min.css");
File.WriteAllText(modulePath + "Web.config", File.ReadAllText(_codeGenTemplatePath + "ModuleRootWebConfig.txt"));
content.Add(modulePath + "Web.config");
File.WriteAllText(modulePath + "Scripts\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));
@@ -355,6 +364,15 @@ namespace Orchard.CodeGeneration.Commands {
}
}
File.WriteAllText(themePath + "Assets.json", File.ReadAllText(_codeGenTemplatePath + "ModuleAssetsJson.txt"));
createdFiles.Add(themePath + "Assets.json");
File.WriteAllText(themePath + "Assets\\Styles.less", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesLess.txt"));
createdFiles.Add(themePath + "Assets\\Styles.less");
File.WriteAllText(themePath + "Styles\\Styles.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesCss.txt"));
createdFiles.Add(themePath + "Styles\\Styles.css");
File.WriteAllText(themePath + "Styles\\Styles.min.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesMinCss.txt"));
createdFiles.Add(themePath + "Styles\\Styles.min.css");
File.WriteAllText(themePath + "Web.config", File.ReadAllText(_codeGenTemplatePath + "ModuleRootWebConfig.txt"));
createdFiles.Add(themePath + "Web.config");
File.WriteAllText(themePath + "Scripts\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));

7
src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
View File

@@ -26,6 +26,7 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -69,6 +70,9 @@
<Compile Include="Services\CodeGenerationCommandInterpreter.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="CodeGenerationTemplates\ModuleStylesMinCss.txt" />
<Content Include="CodeGenerationTemplates\ModuleStylesCss.txt" />
<Content Include="CodeGenerationTemplates\ModuleStylesLess.txt" />
<Content Include="CodeGenerationTemplates\ModuleTestsCsProj.txt" />
<Content Include="CodeGenerationTemplates\StaticFilesWebConfig.txt" />
<Content Include="CodeGenerationTemplates\Theme.png" />
@@ -103,6 +107,9 @@
<ItemGroup>
<Content Include="CodeGenerationTemplates\Placement.info" />
</ItemGroup>
<ItemGroup>
<Content Include="CodeGenerationTemplates\ModuleAssetsJson.txt" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>