Skip to content

Commit

Permalink
Fixing that some Workflows activities were not rendered correctly in …
Browse files Browse the repository at this point in the history
…the workflow editor

They were just rendered as a small, empty rectangle:
- Unassign Role activity styling was syntactically incorrect
- Send Email and Is In Role activity styling file name did not match what the Workflows ResourceManifest expects
  • Loading branch information
BenedekFarkas committed Mar 10, 2024
1 parent 54ab14b commit 2d0630d
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 33 deletions.
8 changes: 2 additions & 6 deletions src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Styles\workflows-activity-sendemail.css" />
<Content Include="Styles\workflows-activity-sendemaildeprecated.css" />
<Content Include="Styles\workflows-activity-send-email.css" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Parts\SmtpSettings.cshtml" />
Expand Down Expand Up @@ -150,9 +149,6 @@
<ItemGroup>
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-SendEmailDeprecated.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config" />
</ItemGroup>
Expand Down Expand Up @@ -219,4 +215,4 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
</Target>
</Project>
</Project>

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<Content Include="Styles\admin-usertask.css" />
<Content Include="Styles\workflows-activity-unassign-role.css" />
<Content Include="Styles\workflows-activity-assign-role.css" />
<Content Include="Styles\workflows-activity-isinrole.css" />
<Content Include="Styles\workflows-activity-is-in-role.css" />
<Content Include="Styles\workflows-activity-usertask.css" />
<Content Include="Views\Admin\Create.cshtml" />
<Content Include="Views\Admin\Edit.cshtml" />
Expand Down Expand Up @@ -273,4 +273,4 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
activity-unassign-role {
.activity-unassign-role {
width: 32px;
height: 32px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4AsSDQYi3LJqFgAAAaRJREFUWMPtl7tKA1EQhr9dNIhXVETEylthYyEknYWCYKeFzyNEwRQ+ggipBAkEawsL9REsbARBEnRjTGGhlbGZyHo4N+OJF/CHIZvzzz+ZzM6Zswv/0KMbKAA3YgVZC8U7UQCaiu0G5J2oagJUA/LviA0JRJq1jINPo8f3n5oSKGrWDhx80eBr0zibMAEawJ6hyRIxtckyomkY+N+JTeBO0zwTDl61CrAumkkH/wH3hoAuXme3KZ2VjxRH245ofrKikU/c+Kfv+48n0NXB2M0/UYHQCSRAHsgB42I5YAeo+ZTMtg1dW+8Q6LPE7weOUv4zuuxtCSSWHy9ZDqhIuS6L5tx3Err4GjDoMQ9aGAbqol32uRVjDn7LcyClkRftvk8CJWkmE7/QRgKLor0K0YwDnk2ajjMk10/xdw0cBa8tbYgEplOl1lmsfAeYk89KiAQ22tC0ngfOQvTAV7bhSqiJ2M4gOg09ksvAiKUSo8Cx+NaB2U6cCXUZMlmgVywLbAOP4vMALIU+VeeBC48ZcAJMdfJ4X5MXkEvgGXgBruVFZVUneAM9RhZRUdfKzwAAAABJRU5ErkJggg==');
Expand Down

0 comments on commit 2d0630d

Please sign in to comment.