lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#19987: Decoupling worfklows from other modules

Browse Source 
Work Item: 19987
This commit is contained in:
Sebastien Ros
2013-08-16 16:01:13 -07:00
parent d2b981f182
commit abac56cf58
52 changed files with 1339 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/CloseCommentsActivity.cs → src/Orchard.Web/Modules/Orchard.Comments/Activities/CloseCommentsActivity.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Logging;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
namespace Orchard.Comments.Activities {
public class CloseCommentsActivity : Task {
public CloseCommentsActivity() {

2
src/Orchard.Web/Modules/Orchard.Comments/Module.txt
View File

@@ -9,5 +9,5 @@ Features:
Orchard.Comments:
Name: Comments
Description: Standard content item comments.
Dependencies: Settings, Orchard.Tokens
Dependencies: Settings, Orchard.Tokens, Orchard.Workflows
Category: Social

6
src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
View File

@@ -60,6 +60,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\CloseCommentsActivity.cs" />
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Controllers\CommentController.cs" />
@@ -105,6 +106,7 @@
<Content Include="Styles\images\menu.comments.png" />
<Content Include="Styles\menu.comments-admin.css" />
<Content Include="Styles\orchard-comments-admin.css" />
<Content Include="Styles\workflows-activity-close-comments.css" />
<Content Include="Views\Admin\Details.cshtml" />
<Content Include="Views\Web.config" />
</ItemGroup>
@@ -121,6 +123,10 @@
<Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
<Name>Orchard.Tokens</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
<Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
<Name>Orchard.Workflows</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Views\Admin\Edit.cshtml" />

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentpublished.css → src/Orchard.Web/Modules/Orchard.Comments/Styles/workflows-activity-close-comments.css
View File

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/MailActivity.cs → src/Orchard.Web/Modules/Orchard.Email/Activities/MailActivity.cs
View File

@@ -11,7 +11,7 @@ using Orchard.Security;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
namespace Orchard.Email.Activities {
public class MailActivity : Task {
private readonly IMessageManager _messageManager;

2
src/Orchard.Web/Modules/Orchard.Workflows/Forms/MailForms.cs → src/Orchard.Web/Modules/Orchard.Email/Forms/MailForms.cs
View File

@@ -3,7 +3,7 @@ using Orchard.DisplayManagement;
using Orchard.Forms.Services;
using Orchard.Localization;
namespace Orchard.Workflows.Forms {
namespace Orchard.Email.Forms {
public class MailForms : IFormProvider {
protected dynamic Shape { get; set; }

2
src/Orchard.Web/Modules/Orchard.Email/Module.txt
View File

@@ -10,4 +10,4 @@ Features:
Name: Email Messaging
FeatureDescription: Email Messaging services.
Category: Messaging
Dependencies: Orchard.Messaging
Dependencies: Orchard.Messaging, Orchard.Workflows

22
src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
View File

@@ -21,6 +21,10 @@
</UpgradeBackupLocation>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -51,12 +55,15 @@
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\MailActivity.cs" />
<Compile Include="Forms\MailForms.cs" />
<Compile Include="Migrations.cs" />
<Compile Include="Drivers\SmtpSettingsPartDriver.cs" />
<Compile Include="Handlers\SmtpSettingsPartHandler.cs" />
<Compile Include="Models\SmtpSettingsPart.cs" />
<Compile Include="Models\SmtpSettingsPartRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourceManifest.cs" />
<Compile Include="Rules\MailActions.cs" />
<Compile Include="Rules\MailForms.cs" />
<Compile Include="Services\EmailMessageEventHandler.cs" />
@@ -65,6 +72,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Styles\workflows-activity-sendemail.css" />
<Content Include="Views\Web.config" />
</ItemGroup>
<ItemGroup>
@@ -79,6 +87,14 @@
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
<Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
<Name>Orchard.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
<Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
<Name>Orchard.Workflows</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Placement.info" />
@@ -86,6 +102,12 @@
<ItemGroup>
<Content Include="web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-SendEmail.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

9
src/Orchard.Web/Modules/Orchard.Email/ResourceManifest.cs Normal file
View File

@@ -0,0 +1,9 @@
using Orchard.UI.Resources;
namespace Orchard.Email {
public class ResourceManifest : IResourceManifestProvider {
public void BuildManifests(ResourceManifestBuilder builder) {
//builder.Add().DefineStyle("WorkflowsActivities-SendEmail").SetUrl("workflows-activity-sendemail.css").SetDependencies("WorkflowsActivities");
}
}
}

25
src/Orchard.Web/Modules/Orchard.Email/Styles/Web.config Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appSettings>
<add key="webpages:Enabled" value="false" />
</appSettings>
<system.web>
<httpHandlers>
<!-- iis6 - for any request in this location, return via managed static file handler -->
<add path="*" verb="*" type="System.Web.StaticFileHandler" />
</httpHandlers>
</system.web>
<system.webServer>
<staticContent>
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
</staticContent>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
</configuration>

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-sendemail.css → src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemail.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-SendEmail.cshtml → src/Orchard.Web/Modules/Orchard.Email/Views/Activity-SendEmail.cshtml
View File

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/AssignRoleActivity.cs → src/Orchard.Web/Modules/Orchard.Roles/Activities/AssignRoleActivity.cs
View File

@@ -10,7 +10,7 @@ using Orchard.Roles.Services;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
namespace Orchard.Roles.Activities {
public class AssignRoleActivity : Task {
private readonly IWorkContextAccessor _workContextAccessor;
private readonly IRepository<UserRolesPartRecord> _repository;

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/IsInRoleActivity.cs → src/Orchard.Web/Modules/Orchard.Roles/Activities/IsInRoleActivity.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Security;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
namespace Orchard.Roles.Activities {
public class IsInRoleActivity : Task {
private readonly IWorkContextAccessor _workContextAccessor;

0
src/Orchard.Web/Modules/Orchard.Workflows/Activities/UserTaskActivity.cs → src/Orchard.Web/Modules/Orchard.Roles/Activities/UserTaskActivity.cs
View File

2
src/Orchard.Web/Modules/Orchard.Workflows/Drivers/UserTaskDriver.cs → src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserTaskDriver.cs
View File

@@ -12,7 +12,7 @@ using Orchard.Workflows.Activities;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Drivers {
namespace Orchard.Roles.Drivers {
public class UserTaskDriver : ContentPartDriver<ContentPart> {
private readonly IWorkflowManager _workflowManager;
private readonly IRepository<AwaitingActivityRecord> _awaitingActivityRepository;

2
src/Orchard.Web/Modules/Orchard.Workflows/Forms/SelectRolesForms.cs → src/Orchard.Web/Modules/Orchard.Roles/Forms/SelectRolesForms.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Forms.Services;
using Orchard.Localization;
using Orchard.Roles.Services;
namespace Orchard.Workflows.Forms {
namespace Orchard.Roles.Forms {
public class SelectRolesForms : IFormProvider {
private readonly IRoleService _roleService;
protected dynamic Shape { get; set; }

2
src/Orchard.Web/Modules/Orchard.Workflows/Forms/UserTaskForms.cs → src/Orchard.Web/Modules/Orchard.Roles/Forms/UserTaskForms.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Forms.Services;
using Orchard.Localization;
using Orchard.Roles.Services;
namespace Orchard.Workflows.Forms {
namespace Orchard.Roles.Forms {
public class UserTaskForms : IFormProvider {
private readonly IRoleService _roleService;
protected dynamic Shape { get; set; }

2
src/Orchard.Web/Modules/Orchard.Roles/Module.txt
View File

@@ -7,4 +7,4 @@ OrchardVersion: 1.7
Description: The roles module is adding the ability to assign roles to users. It's also providing a set of default roles for which other modules can define default permissions.
FeatureDescription: Standard user roles.
Category: Core
Dependencies: Orchard.Users
Dependencies: Orchard.Users, Orchard.Workflows

35
src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
View File

@@ -21,6 +21,10 @@
</UpgradeBackupLocation>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -54,8 +58,14 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\AssignRoleActivity.cs" />
<Compile Include="Activities\IsInRoleActivity.cs" />
<Compile Include="Activities\UserTaskActivity.cs" />
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Drivers\UserTaskDriver.cs" />
<Compile Include="Forms\SelectRolesForms.cs" />
<Compile Include="Forms\UserTaskForms.cs" />
<Compile Include="ImportExport\RolesCustomExportStep.cs" />
<Compile Include="ImportExport\RolesExportEventHandler.cs" />
<Compile Include="ImportExport\RolesRecipeHandler.cs" />
@@ -71,6 +81,7 @@
<Compile Include="Models\RolesPermissionsRecord.cs" />
<Compile Include="Models\UserRolesPartRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourceManifest.cs" />
<Compile Include="Services\IRoleService.cs" />
<Compile Include="Services\RolesBasedAuthorizationService.cs" />
<Compile Include="Services\RoleService.cs" />
@@ -81,6 +92,10 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Styles\admin-usertask.css" />
<Content Include="Styles\workflows-activity-assign-role.css" />
<Content Include="Styles\workflows-activity-isinrole.css" />
<Content Include="Styles\workflows-activity-usertask.css" />
<Content Include="Views\Admin\Create.cshtml" />
<Content Include="Views\Admin\Edit.cshtml" />
<Content Include="Views\Admin\Index.cshtml" />
@@ -97,6 +112,14 @@
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
<Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
<Name>Orchard.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
<Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
<Name>Orchard.Workflows</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Placement.info" />
@@ -109,6 +132,18 @@
<ItemGroup>
<Content Include="web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-IsInRole.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-UserTask.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\UserTask.ActionButton.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

12
src/Orchard.Web/Modules/Orchard.Roles/ResourceManifest.cs Normal file
View File

@@ -0,0 +1,12 @@
using Orchard.UI.Resources;
namespace Orchard.Roles {
public class ResourceManifest : IResourceManifestProvider {
public void BuildManifests(ResourceManifestBuilder builder) {
//var manifest = builder.Add();
//manifest.DefineStyle("WorkflowsActivities-IsInRole").SetUrl("workflows-activity-isinrole.css").SetDependencies("WorkflowsActivities");
//manifest.DefineStyle("WorkflowsActivities-UserTask").SetUrl("workflows-activity-usertask.css").SetDependencies("WorkflowsActivities");
}
}
}

25
src/Orchard.Web/Modules/Orchard.Roles/Styles/Web.config Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appSettings>
<add key="webpages:Enabled" value="false" />
</appSettings>
<system.web>
<httpHandlers>
<!-- iis6 - for any request in this location, return via managed static file handler -->
<add path="*" verb="*" type="System.Web.StaticFileHandler" />
</httpHandlers>
</system.web>
<system.webServer>
<staticContent>
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
</staticContent>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
</configuration>

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/admin-usertask.css → src/Orchard.Web/Modules/Orchard.Roles/Styles/admin-usertask.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentremoved.css → src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-assign-role.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-isinrole.css → src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-isinrole.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-usertask.css → src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-usertask.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-IsInRole.cshtml → src/Orchard.Web/Modules/Orchard.Roles/Views/Activity-IsInRole.cshtml
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-UserTask.cshtml → src/Orchard.Web/Modules/Orchard.Roles/Views/Activity-UserTask.cshtml
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Views/UserTask.ActionButton.cshtml → src/Orchard.Web/Modules/Orchard.Roles/Views/UserTask.ActionButton.cshtml
View File

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/DecisionActivity.cs → src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Scripting.CSharp.Services;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
namespace Orchard.Workflows.Activities {
namespace Orchard.Scripting.CSharp.Activities {
public class DecisionActivity : Task {
private readonly ICSharpService _csharpService;
private readonly IOrchardServices _orchardServices;

2
src/Orchard.Web/Modules/Orchard.Workflows/Forms/DecisionForms.cs → src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Forms/DecisionForms.cs
View File

@@ -3,7 +3,7 @@ using Orchard.DisplayManagement;
using Orchard.Forms.Services;
using Orchard.Localization;
namespace Orchard.Workflows.Forms {
namespace Orchard.Scripting.CSharp.Forms {
public class DecisionForms : IFormProvider {
protected dynamic Shape { get; set; }
public Localizer T { get; set; }

1
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Module.txt
View File

@@ -9,6 +9,7 @@ Features:
Orchard.Scripting.CSharp:
Description: Provides C# compiler services.
Category: Scripting
Dependencies: Orchard.Workflows
Orchard.Scripting.CSharp.Validation
Description: Provides a Script Validation part.
Name: Script Validation

17
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
View File

@@ -67,6 +67,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="Styles\workflows-activity-decision.css" />
<Content Include="Web.config" />
<Content Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
@@ -80,12 +81,22 @@
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
<Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
<Name>Orchard.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
<Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
<Name>Orchard.Workflows</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Views\DefinitionTemplates\ScriptValidationPartSettings.cshtml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\DecisionActivity.cs" />
<Compile Include="Drivers\ScriptValidationPartDriver.cs" />
<Compile Include="Forms\DecisionForms.cs" />
<Compile Include="Migrations.cs" />
<Compile Include="Models\ScriptValidationPart.cs" />
<Compile Include="Services\ICSharpService.cs" />
@@ -101,6 +112,12 @@
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-Decision.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

25
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Styles/Web.config Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appSettings>
<add key="webpages:Enabled" value="false" />
</appSettings>
<system.web>
<httpHandlers>
<!-- iis6 - for any request in this location, return via managed static file handler -->
<add path="*" verb="*" type="System.Web.StaticFileHandler" />
</httpHandlers>
</system.web>
<system.webServer>
<staticContent>
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
</staticContent>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
</configuration>

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-decision.css → src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Styles/workflows-activity-decision.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Decision.cshtml → src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Views/Activity-Decision.cshtml
View File

2
src/Orchard.Web/Modules/Orchard.Workflows/Module.txt
View File

@@ -9,4 +9,4 @@ Description: Provides tools to create custom workflows.
Features:
Orchard.Workflows:
Description: Provides tools to create custom workflows.
Dependencies: Orchard.Tokens, Orchard.Forms, Orchard.jQuery, Orchard.Roles, Orchard.Comments, Orchard.Scripting.CSharp
Dependencies: Orchard.Tokens, Orchard.Forms, Orchard.jQuery

61
src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
View File

@@ -75,25 +75,28 @@
<Content Include="Scripts\jquery.jsPlumb-1.4.1-all-min.js" />
<Content Include="Scripts\orchard-workflows-serialize.js" />
<Content Include="Scripts\orchard-workflows.js" />
<Content Include="Styles\workflows-activity-trigger.css" />
<Content Include="Styles\workflows-activity-signal.css" />
<Content Include="Styles\workflows-activity-web-request.css" />
<Content Include="Styles\workflows-activity-redirect.css" />
<Content Include="Styles\workflows-activity-merge-branch.css" />
<Content Include="Styles\workflows-activity-exclusive-branch.css" />
<Content Include="Styles\workflows-activity-content-delete.css" />
<Content Include="Styles\workflows-activity-content-updated.css" />
<Content Include="Styles\images\menu.workflows.png" />
<Content Include="Styles\menu.workflows-admin.css" />
<Content Include="Styles\workflows-activity.css" />
<Content Include="Styles\images\cog.png" />
<Content Include="Styles\workflows-activity-delete-publish.css" />
<Content Include="Styles\workflows-activity-delete.css" />
<Content Include="Styles\workflows-activity-timer.css" />
<Content Include="Styles\workflows-activity-branch.css" />
<Content Include="Styles\orchard-workflows-admin.css" />
<Content Include="Styles\admin-usertask.css" />
<Content Include="Styles\workflows-activity-isinrole.css" />
<Content Include="Styles\workflows-activity-usertask.css" />
<Content Include="Styles\workflows-activity-notify.css" />
<Content Include="Styles\workflows-activity-publish.css" />
<Content Include="Styles\workflows-activity-sendemail.css" />
<Content Include="Styles\workflows-activity-contentremoved.css" />
<Content Include="Styles\workflows-activity-contentpublished.css" />
<Content Include="Styles\workflows-activity-contentversioned.css" />
<Content Include="Styles\workflows-activity-contentcreated.css" />
<Content Include="Styles\workflows-activity-decision.css" />
<Content Include="Styles\workflows-activity-content-removed.css" />
<Content Include="Styles\workflows-activity-content-published.css" />
<Content Include="Styles\workflows-activity-content-versioned.css" />
<Content Include="Styles\workflows-activity-content-created.css" />
<Content Include="Web.config" />
<Content Include="Views\Web.config" />
<Content Include="Scripts\Web.config" />
@@ -110,22 +113,10 @@
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Comments\Orchard.Comments.csproj">
<Project>{14C049FD-B35B-415A-A824-87F26B26E7FD}</Project>
<Name>Orchard.Comments</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
<Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
<Name>Orchard.Forms</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Roles\Orchard.Roles.csproj">
<Project>{d10ad48f-407d-4db5-a328-173ec7cb010f}</Project>
<Name>Orchard.Roles</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Scripting.CSharp\Orchard.Scripting.CSharp.csproj">
<Project>{5d13ef34-8b39-4ec5-847f-e12892acf841}</Project>
<Name>Orchard.Scripting.CSharp</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
<Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
<Name>Orchard.Tokens</Name>
@@ -134,32 +125,23 @@
<ItemGroup>
<Compile Include="Activities\ContentActivity.cs" />
<Compile Include="Activities\BranchActivity.cs" />
<Compile Include="Activities\AssignRoleActivity.cs" />
<Compile Include="Activities\CloseCommentsActivity.cs" />
<Compile Include="Activities\TriggerActivity.cs" />
<Compile Include="Activities\SignalActivity.cs" />
<Compile Include="Activities\MergeBranchActivity.cs" />
<Compile Include="Activities\DeleteActivity.cs" />
<Compile Include="Activities\ExclusiveBranchActivity.cs" />
<Compile Include="Activities\IsInRoleActivity.cs" />
<Compile Include="Activities\MailActivity.cs" />
<Compile Include="Activities\RedirectActivity.cs" />
<Compile Include="Activities\TimerActivity.cs" />
<Compile Include="Activities\WebRequestActivity.cs" />
<Compile Include="Controllers\SignalController.cs" />
<Compile Include="Forms\DecisionForms.cs" />
<Compile Include="Forms\SignalForms.cs" />
<Compile Include="Forms\RedirectActionForm.cs" />
<Compile Include="Forms\TimerForms.cs" />
<Compile Include="Forms\BranchForms.cs" />
<Compile Include="Forms\MailForms.cs" />
<Compile Include="Activities\PublishActivity.cs" />
<Compile Include="Activities\UserTaskActivity.cs" />
<Compile Include="Activities\DecisionActivity.cs" />
<Compile Include="Activities\NotificationActivity.cs" />
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Drivers\UserTaskDriver.cs" />
<Compile Include="Drivers\WorkflowDriver.cs" />
<Compile Include="Forms\WebRequestForm.cs" />
<Compile Include="Handlers\WorkflowContentHandler.cs" />
@@ -177,8 +159,6 @@
<Compile Include="Migrations.cs" />
<Compile Include="Models\WorkflowDefinitionRecord.cs" />
<Compile Include="Forms\ContentActivityForms.cs" />
<Compile Include="Forms\SelectRolesForms.cs" />
<Compile Include="Forms\UserTaskForms.cs" />
<Compile Include="Forms\NotificationActivityForms.cs" />
<Compile Include="ResourceManifest.cs" />
<Compile Include="Services\GenericEventService.cs" />
@@ -219,27 +199,12 @@
<ItemGroup>
<Content Include="Views\Activity-Notify.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-Decision.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Parts.Workflow.SummaryAdmin.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\UserTask.ActionButton.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-UserTask.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-IsInRole.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Admin\List.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-SendEmail.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-Branch.cshtml" />
</ItemGroup>

53
src/Orchard.Web/Modules/Orchard.Workflows/ResourceManifest.cs
View File

@@ -1,43 +1,32 @@
using Orchard.UI.Resources;
using System.Collections.Generic;
using System.Linq;
using Orchard.Environment;
using Orchard.UI.Resources;
using Orchard.Utility.Extensions;
using Orchard.Workflows.Services;
namespace Orchard.Workflows {
public class ResourceManifest : IResourceManifestProvider {
private readonly Work<IActivitiesManager> _activitiesManager;
public ResourceManifest(Work<IActivitiesManager> activitiesManager) {
_activitiesManager = activitiesManager;
}
public void BuildManifests(ResourceManifestBuilder builder) {
builder.Add().DefineStyle("WorkflowsAdmin").SetUrl("orchard-workflows-admin.css").SetDependencies("~/Themes/TheAdmin/Styles/Site.css");
var manifest = builder.Add();
manifest.DefineStyle("WorkflowsAdmin").SetUrl("orchard-workflows-admin.css").SetDependencies("~/Themes/TheAdmin/Styles/Site.css");
builder.Add().DefineStyle("WorkflowsActivities-Branch").SetUrl("workflows-activity-branch.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-ContentCreate").SetUrl("workflows-activity-contentcreated.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-ContentPublished").SetUrl("workflows-activity-contentpublished.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-ContentRemoved").SetUrl("workflows-activity-contentremoved.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-ContentVersioned").SetUrl("workflows-activity-contentversioned.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-Delete-Publish").SetUrl("workflows-activity-delete-publish.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-Decision").SetUrl("workflows-activity-decision.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-IsInRole").SetUrl("workflows-activity-isinrole.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-Notify").SetUrl("workflows-activity-notify.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-Publish").SetUrl("workflows-activity-publish.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-SendEmail").SetUrl("workflows-activity-sendemail.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-Timer").SetUrl("workflows-activity-timer.css").SetDependencies("WorkflowsAdmin");
builder.Add().DefineStyle("WorkflowsActivities-UserTask").SetUrl("workflows-activity-usertask.css").SetDependencies("WorkflowsAdmin");
var activityNames = _activitiesManager.Value.GetActivities().Select(x => "WorkflowsActivity-" + x.Name).ToArray();
builder.Add().DefineStyle("WorkflowsActivities").SetUrl("workflows-activity.css")
.SetDependencies(
"WorkflowsActivities-Branch",
"WorkflowsActivities-ContentCreate",
"WorkflowsActivities-ContentPublished",
"WorkflowsActivities-ContentRemoved",
"WorkflowsActivities-ContentVersioned",
"WorkflowsActivities-Delete-Publish",
"WorkflowsActivities-Decision",
"WorkflowsActivities-IsInRole",
"WorkflowsActivities-Notify",
"WorkflowsActivities-Publish",
"WorkflowsActivities-SendEmail",
"WorkflowsActivities-Timer",
"WorkflowsActivities-UserTask"
);
foreach (var activityName in activityNames) {
manifest.DefineStyle(activityName).SetUrl(activityName.HtmlClassify()).SetDependencies("WorkflowsAdmin");
}
builder.Add().DefineScript("jsPlumb").SetUrl("jquery.jsPlumb-1.4.1-all-min.js").SetDependencies("jQueryUI");
manifest.DefineStyle("WorkflowsActivities").SetUrl("workflows-activity.css").SetDependencies(activityNames);
manifest.DefineScript("jsPlumb").SetUrl("jquery.jsPlumb-1.4.1-all-min.js").SetDependencies("jQueryUI");
}
}
}

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentcreated.css → src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-created.css
View File

0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentversioned.css → src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-delete.css
View File

1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-published.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-removed.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-updated.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-content-versioned.css Normal file
View File

@@ -0,0 +1 @@


0
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-delete-publish.css → src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-delete.css
View File

1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-exclusive-branch.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-merge-branch.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-redirect.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-signal.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-trigger.css Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-web-request.css Normal file
View File

@@ -0,0 +1 @@