From 2d0630da69e76882c39ff6aea5c6ec55298b05de Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Sun, 10 Mar 2024 22:39:57 +0100 Subject: [PATCH] Fixing that some Workflows activities were not rendered correctly in 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 --- .../Modules/Orchard.Email/Orchard.Email.csproj | 8 ++------ ...il.css => workflows-activity-send-email.css} | 0 .../workflows-activity-sendemaildeprecated.css | 17 ----------------- .../Views/Activity-SendEmailDeprecated.cshtml | 7 ------- .../Modules/Orchard.Roles/Orchard.Roles.csproj | 4 ++-- ...le.css => workflows-activity-is-in-role.css} | 0 .../Styles/workflows-activity-unassign-role.css | 2 +- 7 files changed, 5 insertions(+), 33 deletions(-) rename src/Orchard.Web/Modules/Orchard.Email/Styles/{workflows-activity-sendemail.css => workflows-activity-send-email.css} (100%) delete mode 100644 src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemaildeprecated.css delete mode 100644 src/Orchard.Web/Modules/Orchard.Email/Views/Activity-SendEmailDeprecated.cshtml rename src/Orchard.Web/Modules/Orchard.Roles/Styles/{workflows-activity-isinrole.css => workflows-activity-is-in-role.css} (100%) diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj index 3e07097e36c..408ed4e428c 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj +++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj @@ -118,8 +118,7 @@ - - + @@ -150,9 +149,6 @@ - - - @@ -219,4 +215,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemail.css b/src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-send-email.css similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemail.css rename to src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-send-email.css diff --git a/src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemaildeprecated.css b/src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemaildeprecated.css deleted file mode 100644 index b10cd302c81..00000000000 --- a/src/Orchard.Web/Modules/Orchard.Email/Styles/workflows-activity-sendemaildeprecated.css +++ /dev/null @@ -1,17 +0,0 @@ -.envelope { - width: 36px; - height: 36px; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAaCAYAAADWm14/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAARhJREFUSEvtlkEORTAQhnsnSxsre+dwBCdwBidwAyewl0jsbJ3Ahsi8jvfK6JsnqGLxFp/IaGf+jr9NBQDcChu8kumlbVsIggAcx7GK53mAtRYChmEQURSxE2wQhiF0XTcL6PteXLF6xacLD+oAkmUZO9gGaZrKkpoJkSRJ2AlnEsexLDXXXAhAbIrQiyPjA01YFIV8fQfLsmQTmJDn+ZS/qqqlCdUuoArPMiY1HIId/toFdBu6rgt1XcuweTfoqpumAd/3x/iqAAV16t5zQj/t9B22SQAZ+DMRxxbhmwUoaFLaSor+69bE7haAcGZS3/aa95AABTWWzlbDGglAaALT+YcSmPIX8DwBj7iQyC7cdym9EzZ4HSBeOGnowJmFUWAAAAAASUVORK5CYII='); - background-repeat: no-repeat; - background-position: center; -} - -.toolbox-task.toolbox-send-email-deprecated { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAaCAYAAADWm14/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAARhJREFUSEvtlkEORTAQhnsnSxsre+dwBCdwBidwAyewl0jsbJ3Ahsi8jvfK6JsnqGLxFp/IaGf+jr9NBQDcChu8kumlbVsIggAcx7GK53mAtRYChmEQURSxE2wQhiF0XTcL6PteXLF6xacLD+oAkmUZO9gGaZrKkpoJkSRJ2AlnEsexLDXXXAhAbIrQiyPjA01YFIV8fQfLsmQTmJDn+ZS/qqqlCdUuoArPMiY1HIId/toFdBu6rgt1XcuweTfoqpumAd/3x/iqAAV16t5zQj/t9B22SQAZ+DMRxxbhmwUoaFLaSor+69bE7haAcGZS3/aa95AABTWWzlbDGglAaALT+YcSmPIX8DwBj7iQyC7cdym9EzZ4HSBeOGnowJmFUWAAAAAASUVORK5CYII='); - background-repeat: no-repeat; - background-position: 5px 5px; -} - -.toolbox-task.toolbox-send-email-deprecated div { - margin-left: 36px; -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/Activity-SendEmailDeprecated.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/Activity-SendEmailDeprecated.cshtml deleted file mode 100644 index 24b2670a540..00000000000 --- a/src/Orchard.Web/Modules/Orchard.Email/Views/Activity-SendEmailDeprecated.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@using Orchard.Utility.Extensions - -
-
- @*@name.CamelFriendly()*@ -
- diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 35fae79ea25..f4e97ce4257 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -157,7 +157,7 @@ - + @@ -273,4 +273,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-isinrole.css b/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-is-in-role.css similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-isinrole.css rename to src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-is-in-role.css diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-unassign-role.css b/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-unassign-role.css index 4c5b78617f0..48694d8e063 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-unassign-role.css +++ b/src/Orchard.Web/Modules/Orchard.Roles/Styles/workflows-activity-unassign-role.css @@ -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==');