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

Improving the editor

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : 814e1cd6b1f6d3d1a3b58bb014e59baf2795086f
This commit is contained in:
Sebastien Ros
2013-01-31 17:36:48 -08:00
parent 94a4ffa4f5
commit e28841f13e
21 changed files with 193 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Workflows/Activities/DeleteActivity.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Workflows.Activities {
}
public override string Name {
get { return "Deleted"; }
get { return "Delete"; }
}
public override LocalizedString Category {

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

@@ -71,6 +71,7 @@
<Content Include="Scripts\jquery.jsPlumb-1.3.16-all-min.js" />
<Content Include="Scripts\orchard-workflows-serialize.js" />
<Content Include="Scripts\orchard-workflows.js" />
<Content Include="Styles\workflows-activity-delete-publish.css" />
<Content Include="Styles\workflows-activity-timer.css" />
<Content Include="Styles\workflows-activity-branch.css" />
<Content Include="Styles\orchard-workflows-admin.css" />
@@ -219,6 +220,12 @@
<ItemGroup>
<Content Include="Views\Activity-MergeBranch.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-Delete.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Activity-Publish.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

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

@@ -11,6 +11,7 @@ namespace Orchard.Workflows {
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");
@@ -25,6 +26,7 @@ namespace Orchard.Workflows {
"WorkflowsActivities-ContentPublished",
"WorkflowsActivities-ContentRemoved",
"WorkflowsActivities-ContentVersioned",
"WorkflowsActivities-Delete-Publish",
"WorkflowsActivities-Decision",
"WorkflowsActivities-IsInRole",
"WorkflowsActivities-Notify",

9
src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows.js
View File

@@ -63,18 +63,17 @@
});
// instanciates a new workflow widget in the editor
var createActivity = function (activityName) {
renderActivity(null, activityName, {}, false, 10, 10);
var createActivity = function (activityName, top, left) {
return renderActivity(null, activityName, {}, false, top, left);
};
// create a new activity node on the editor
$('.activity-toolbox-item').draggable({ helper: 'clone' });
$('.activity-editor').droppable({ drop: function(event, ui) {
$('#activity-editor').droppable({ drop: function(event, ui) {
var activityName = ui.draggable.data('activity-name');
createActivity(activityName);
createActivity(activityName, event.pageY, event.pageX);
}
});

43
src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
View File

@@ -13,6 +13,7 @@
-moz-opacity: 0.8;
opacity: 0.8;
filter: alpha(opacity=80);
white-space: nowrap;
}
.activity:hover, .dragHover {
@@ -28,6 +29,12 @@
background-repeat: no-repeat;
}
.activity-toolbox-item.event {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAATCAYAAACk9eypAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAANNJREFUOE+VkbENhDAMRcOtRElDRRsxB5MwAxNQ0yAGYAJqWiagASFfbMmRHXzcXfGk+Nvf+UocAPzDyxIfMcUnZJF94WYg0ziOkOc50TQNHMehZlQRyLqui4a+74Ok+jrSeZ5TXdc0XJYl7Psu+4Qssm3boKoqMrRtGyRwqHnvo1kZZH4JmxFpcDI/UxQFrOsa2okh5HecH19nGAY6y+1IPKTgbel2RA0xfNsv/0Dwa83zHErdUwWzLIu5HbkJCOa3tiM34bouMljbEVN8whQ/A+4NnH6HdIESjBQAAAAASUVORK5CYII=');
background-position: top left;
background-repeat: no-repeat;
}
.start {
border-width: 2px;
background-color: #eee;
@@ -81,29 +88,41 @@
}
#workflow-container {
width:auto;
margin:0 auto;
background:#99c;
}
#editor-wrapper {
display: block;
float: left;
width: 100%;
}
#workflow-footer {
clear: left;
}
#activity-editor {
position: relative;
float:left;
min-height: 500px; /* real browsers */
height: auto !important; /* real browsers */
display: block;
padding: 0;
margin: 0;
min-height: 600px;
overflow:auto;
margin-right: 302px; /* width + borders */
}
/* toolbox */
#activity-toolbox {
padding: 0 5px;
width: 300px;
height: 500px;
display: block;
padding: 0;
margin: 0;
height: 600px;
overflow-y: scroll;
overflow-x: hidden;
border: 1px solid #E4E5E6;
background-color: #F3F4F5;
float: right;
float:left;
width: 300px;
margin-left: -302px; /* width + borders */
}
#activity-toolbox .activity-toolbox-item {

17
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentcreated.css
View File

@@ -1 +1,16 @@

.activity-content-created div {
width: 36px;
height: 36px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAYCAYAAAD6S912AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAN5JREFUSEvdlcENwyAMAIn64NkROkSePMoKzJERMgEzZMwoH1DkYhSiJDJgIvXRPk4Cy1xsS1bENE3Q9z2LYRjAOScAIIswxpCPc2itYVkWUoZE4ZYU7mSS9N6fPlyScoQiCZVSse2StEmIefM8wziOWWmzEPPWdRU5KVfYXfOC9E1Jb1WY4lSlTUJ8WMJaCywhwlkA9HCFz0B3ie0cR8KusMT/CiURi/x2y9m2SpSEry3pcThXCcJ917/eMvmgRq1CXLHjLNMdR5DGkM4xLwjlSUgt+h2isOU3WsNaCx9FtNaZP8PEygAAAABJRU5ErkJggg==');
background-repeat: no-repeat;
background-position: center;
text-indent: -9999px;
}
.toolbox-content-created div {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAYCAYAAAD6S912AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAN5JREFUSEvdlcENwyAMAIn64NkROkSePMoKzJERMgEzZMwoH1DkYhSiJDJgIvXRPk4Cy1xsS1bENE3Q9z2LYRjAOScAIIswxpCPc2itYVkWUoZE4ZYU7mSS9N6fPlyScoQiCZVSse2StEmIefM8wziOWWmzEPPWdRU5KVfYXfOC9E1Jb1WY4lSlTUJ8WMJaCywhwlkA9HCFz0B3ie0cR8KusMT/CiURi/x2y9m2SpSEry3pcThXCcJ917/eMvmgRq1CXLHjLNMdR5DGkM4xLwjlSUgt+h2isOU3WsNaCx9FtNaZP8PEygAAAABJRU5ErkJggg==');
background-repeat: no-repeat;
background-position: 10px 10px;
padding-left: 46px !important;
}

5
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentpublished.css
View File

@@ -1 +1,4 @@

.toolbox-content-published div {
padding-left: 46px !important;
}

5
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentremoved.css
View File

@@ -1 +1,4 @@

.toolbox-content-removed div {
padding-left: 46px !important;
}

5
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-contentversioned.css
View File

@@ -1 +1,4 @@

.toolbox-content-versioned div {
padding-left: 46px !important;
}

35
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-delete-publish.css Normal file
View File

@@ -0,0 +1,35 @@
.delete {
width: 36px;
height: 36px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAYCAYAAAD+vg1LAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAQ1JREFUSEvdlsERRTAQhuOkDEU4ujjlrg4lqEANKtCBalxV4MKYfbvei9mwEhlc3uEbdv/ktxGZpQBAZFkWVVUVpGkqUpYlTNMkziXEJNE0jWjIqesah8rzxeQ8z1AUBWRZBn3fY8rWh2EArTXkeQ7jOB504pAguq7jFSVcM5gVtW2L4VFXVBlf3hPQSt4zprLxna4P+L0zykUMa4mM2Nzv5mMKYkkwE12mFoLxd/NQSARjqojM+ZU2kq7mft1Yl7ElYBzt4iD9jrFzvMv4VuwyDq34snH8ljH/Sh41fq3iW/H/GFPOHFt+fNexEiHGQXiNz1qRD6FVRZt4pXn64M11M8Z2D65278P+HQD1AV43SzROuYXRAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: center;
}
.toolbox-delete {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAYCAYAAAD+vg1LAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAQ1JREFUSEvdlsERRTAQhuOkDEU4ujjlrg4lqEANKtCBalxV4MKYfbvei9mwEhlc3uEbdv/ktxGZpQBAZFkWVVUVpGkqUpYlTNMkziXEJNE0jWjIqesah8rzxeQ8z1AUBWRZBn3fY8rWh2EArTXkeQ7jOB504pAguq7jFSVcM5gVtW2L4VFXVBlf3hPQSt4zprLxna4P+L0zykUMa4mM2Nzv5mMKYkkwE12mFoLxd/NQSARjqojM+ZU2kq7mft1Yl7ElYBzt4iD9jrFzvMv4VuwyDq34snH8ljH/Sh41fq3iW/H/GFPOHFt+fNexEiHGQXiNz1qRD6FVRZt4pXn64M11M8Z2D65278P+HQD1AV43SzROuYXRAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-delete div {
margin-left: 36px;
}
.publish {
width: 36px;
height: 36px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAWCAYAAADeiIy1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAX9JREFUSEutlb3NhDAMQIMoKL8RGIKS4qhoEXMwAqMwARswDS0T0ICQPzuKkfNDLqe74umOYPvFIRAFAEQ+TRNUVfUV8zxjKV1PktGvuq7rNY5jMPET6rqGdV2xJqjzPKHve2iaBvZ912NqWRYdKAYLpKSbCM2Grt1ZPoISRRKeANdV1I2YjW4T4eJ/CEtd5IQ0KMmkhBmGAbRdtoiwTBIas3A7SRExcsmiopjkXrqIKIkUCcUFRZz8bgKJEr0yXkE3WdxzH3yK5F5yS4TvlN6FkcRPJPIVSRPJAigJbmEZYwSML6IBLFQ8FYphakiBhSciYksTwuS/KHfbNui6zussKEKKVJmUcI5TL0eyJxFRvpOZvDsnIKKtHX5GAgp67MyVEA8dEWVMRARlJp6WxIqPiKIdWWARvRtNrPwOyphQPf0+uccEJ1Ghp+OBYdktpR3Xtq3+Wh/HIWO9g48To19rxLsvl1cc6Xfcz45yJtSNFpk/OXf2DaYTOpUtCQCof3oShZANW+T+AAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: center;
}
.toolbox-publish {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAWCAYAAADeiIy1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAX9JREFUSEutlb3NhDAMQIMoKL8RGIKS4qhoEXMwAqMwARswDS0T0ICQPzuKkfNDLqe74umOYPvFIRAFAEQ+TRNUVfUV8zxjKV1PktGvuq7rNY5jMPET6rqGdV2xJqjzPKHve2iaBvZ912NqWRYdKAYLpKSbCM2Grt1ZPoISRRKeANdV1I2YjW4T4eJ/CEtd5IQ0KMmkhBmGAbRdtoiwTBIas3A7SRExcsmiopjkXrqIKIkUCcUFRZz8bgKJEr0yXkE3WdxzH3yK5F5yS4TvlN6FkcRPJPIVSRPJAigJbmEZYwSML6IBLFQ8FYphakiBhSciYksTwuS/KHfbNui6zussKEKKVJmUcI5TL0eyJxFRvpOZvDsnIKKtHX5GAgp67MyVEA8dEWVMRARlJp6WxIqPiKIdWWARvRtNrPwOyphQPf0+uccEJ1Ghp+OBYdktpR3Xtq3+Wh/HIWO9g48To19rxLsvl1cc6Xfcz45yJtSNFpk/OXf2DaYTOpUtCQCof3oShZANW+T+AAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-publish div {
margin-left: 36px;
}

10
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-isinrole.css
View File

@@ -5,3 +5,13 @@
background-repeat: no-repeat;
background-position: center;
}
.toolbox-is-in-role {
background-image: url('data:image/jpg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/4QBoRXhpZgAATU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAAExAAIAAAASAAAATgAAAAAAAABgAAAAAQAAAGAAAAABUGFpbnQuTkVUIHYzLjUuMTAA/9sAQwABAQEBAQEBAQEBAQEBAQECAgEBAQEDAgICAgMDBAQDAwMDBAQGBQQEBQQDAwUHBQUGBgYGBgQFBwcHBgcGBgYG/9sAQwEBAQEBAQEDAgIDBgQDBAYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYG/8AAEQgAIAAkAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A/v4rwP8Aae/aW+E37IXwO8e/tB/GzXJdE8AfD/SvtF8tlCs19f3LkJbWNlCzKJbqeVkijQsq7mBdkQM6++V+D3/Bf/4ZW37S/wCx837OHw8+JHgQftJweLbDxx8OP2ernx1aWvizx1YaXDdpeWukaS0n2i/lWGW4mSOFGMklqEXL4FAHxH8HP+DrD4E+NvjPpngr4qfsxeMvhD8I9b8QGxs/i/bfE+DXrqxhkuFjtrzUtIFjB5MAjYyz+Rc3DxBWEaXBxn+rLT9QsdWsLLVNLvLXUdM1K0juNO1CxnWaG4gkUNHJG68MrKQQw4IIIr/IY+Ef7OHxv+OXxgsvgP8ADT4a+LNf+Kc+tPY6p4VGiTRTaO0U6w3U+qblH2G3tnb9/NcbI4ArGRlANf6pH7EuqfDKT9lv4JeD/hV8a/h3+0DoXwk+Gug+D9V+JXwx8dWniLTbzU9J063t7jN3bSOnmHarlWIYCRSQM0AfVVFFFACMwVSx6KOa/wAkX9tb4/8Aiz9pv9rL49fHTxZrd7rOp+N/ibqc2k3VyWVrfSYZjDpttGp5SOC0ht4lXsIx3r/W6IBBBGQRyK/ks+O//Bqd8NfiH8XPHfjn4Rftcax8HfAPizXptQ0X4aa18D18TSaO053zW8WoLrFqZIFlaTyleHekexHeVlMjAH8h3jz9tf8AbL+KfhHVvh/8Tv2tv2m/iN4C16OFNd8EePPj1rmsaRepFIskSz2dxdvFIEkijdQynDIpHIBr9jP+DZn4/wDif4a/8FDIPgzb6zeReCv2ivh5rFjrvh4Atb3GqaRazahYXLL0WSKOC/RWP8NxIP4hX6E/8Qjn/WQT/wA1R/8Awlr9Hf8AgmV/wb+fDT/gnx8en/aN8U/HrV/2gfiDoGiXFn8MYo/huvhXT9Dku4ZIL66li+33b3U728pijO+JI1km3JKzxtEAf0J0UUUAf//Z');
background-repeat: no-repeat;
background-position: 5px 5px;
}
.toolbox-is-in-role div {
margin-left: 36px;
}

10
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-sendemail.css
View File

@@ -5,3 +5,13 @@
background-repeat: no-repeat;
background-position: center;
}
.toolbox-send-email {
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-send-email div {
margin-left: 36px;
}

7
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-timer.css
View File

@@ -6,12 +6,9 @@
background-position: center;
}
.toolbox-timer {
.toolbox-timer div {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAUNJREFUSEu1VsGRhCAQJCeffnz5Nw5DMAJjMAIzMAIj8O3XCPxoWXOMggfY4Fh111W9tYvN9DAMuIqIkhyGgbIsg+z7XkvwPEs4eByHapoGBkWs65q2bYOxHgPTNMEgEo7jqEP48bwfqXJIGZbt/hLLPM9zmudZS3wsy0JlWcI57krOj5jYCJNAiTlJXQZd18UEJ/Z9p6qqqCgKWtfVjP4CJdi2LT9SMPsw8zcDRrgSm+RjY03LmWkXJAa6tSlsbd7wR3lQ3SUGjHAVXCbvQMU6RmoQlpuroXiiHYgFkBpYnRvvk4HVuXTnQIMvJbI6l64BLJFkk6WAmyxpUwmibSo5aBJED5p+9npVvCFxVVwGSMD8s8uOiYSB2EMsKaZJ7Ix7GzD/9YVjGVuJhE5J73hecEvUcil+eukHJMHfFgaaq0nqBz88GIi8S10IAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-timer div {
margin-left: 36px;
padding-left: 46px !important;
}

17
src/Orchard.Web/Modules/Orchard.Workflows/Styles/workflows-activity-usertask.css
View File

@@ -1 +1,16 @@

.activity-user-task div {
width: 36px;
height: 36px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAWCAYAAADTlvzyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAJVJREFUSEvtk80JwCAMRi099NgROoQLuIJzOIJze/KQasASJFQFTS8VHog/eSj5lPcetNYiOOdAWWvZzRUYY+YKc8EQAqShKDFG9KwUHiLCFigUb5r6+RUns9bDRrgSj6M+yJEPlwulSNnbybyLP4cIaXf2m1oMx0JcOAsUfpFDUdjFlfw5fKU3LtNiIS4cBYWyTePgBu7f4tblZVaYAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: center;
text-indent: -9999px;
}
.toolbox-user-task div {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAWCAYAAADTlvzyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAJVJREFUSEvtk80JwCAMRi099NgROoQLuIJzOIJze/KQasASJFQFTS8VHog/eSj5lPcetNYiOOdAWWvZzRUYY+YKc8EQAqShKDFG9KwUHiLCFigUb5r6+RUns9bDRrgSj6M+yJEPlwulSNnbybyLP4cIaXf2m1oMx0JcOAsUfpFDUdjFlfw5fKU3LtNiIS4cBYWyTePgBu7f4tblZVaYAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
padding-left: 46px !important;
}

7
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Delete.cshtml Normal file
View File

@@ -0,0 +1,7 @@
@using Orchard.Utility.Extensions
<div title="@T("Delete content item")">
<div class="delete"></div>
@*@name.CamelFriendly()*@
</div>

8
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Notify.cshtml
View File

@@ -4,10 +4,6 @@
string name = Model.Name;
}
<div title="@Model.State.Message">
@name.CamelFriendly()
@if (Model.State.Notification != null) {
@:- @Model.State.Notification
}
<div class="activity-notify" title="@Model.State.Notification: @Model.State.Message">
<div>@name.CamelFriendly()</div>
</div>

7
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-Publish.cshtml Normal file
View File

@@ -0,0 +1,7 @@
@using Orchard.Utility.Extensions
<div title="@T("Publish content item")">
<div class="publish"></div>
@*@name.CamelFriendly()*@
</div>

5
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity-UserTask.cshtml
View File

@@ -6,7 +6,6 @@
var outcomes = String.Join(",", actions == null ? new string[0] : actions.Split(new []{','}, StringSplitOptions.RemoveEmptyEntries).Select(x => "'" + x.Trim() + "'").ToArray());
}
<div class="event" data-outcomes="@outcomes">
@name.CamelFriendly()
<div class="event activity-@name.HtmlClassify()" title="@Model.Description" data-outcomes="@outcomes">
<div>@name.CamelFriendly()</div>
</div>

4
src/Orchard.Web/Modules/Orchard.Workflows/Views/Activity.cshtml
View File

@@ -6,7 +6,7 @@
string canStartClass = Model.CanStartWorkflow ? "canStart" : null;
}
<div class="@isEventClass @canStartClass">
@name.CamelFriendly()
<div class="@isEventClass @canStartClass activity-@name.HtmlClassify()" title="@Model.Description">
<div>@name.CamelFriendly()</div>
</div>

22
src/Orchard.Web/Modules/Orchard.Workflows/Views/ActivityToolbox.cshtml
View File

@@ -6,18 +6,16 @@
IList<IActivity> allActivities = Model.AllActivities;
}
<!-- List of available activities -->
<div id="activity-toolbox">
<ul>
@foreach (var activity in allActivities) {
<li class="activity-toolbox-item @(activity.IsEvent ? "event" : null) toolbox-@activity.Name.HtmlClassify()" data-activity-name="@activity.Name" title="@activity.Description">
<div>
<h2>@activity.Name.CamelFriendly()</h2>
<span class="hint">@activity.Description</span>
</div>
</li>
}
</ul>
</div>
<ul>
@foreach (var activity in allActivities) {
<li class="activity-toolbox-item @(activity.IsEvent ? "event" : null) toolbox-@activity.Name.HtmlClassify()" data-activity-name="@activity.Name" title="@activity.Description">
<div>
<h2>@activity.Name.CamelFriendly()</h2>
<span class="hint">@activity.Description</span>
</div>
</li>
}
</ul>
@* Render script to initialize a new jsplumb shape in the form of activities['activity-name'].create() *@
@using (Script.Foot()) {

31
src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml
View File

@@ -19,23 +19,26 @@
@Html.ValidationSummary()
<div id="workflow-container">
@Display.ActivityToolbox(Model)
<div id="activity-editor">
<div id="activity-toolbar">
<div id="activity-toolbar-start">
<input type="checkbox" id="activity-toolbar-start-checkbox"/>
<label for="activity-toolbar-start-checkbox" title="@T("Starts workflow")"></label>
</div>
<div id="activity-toolbar-edit">
<label title="@T("Edit")"></label>
</div>
<div id="activity-toolbar-delete">
<label title="@T("Remove")"></label>
<div id="editor-wrapper">
<div id="activity-editor">
<div id="activity-toolbar">
<div id="activity-toolbar-start">
<input type="checkbox" id="activity-toolbar-start-checkbox"/>
<label for="activity-toolbar-start-checkbox" title="@T("Starts workflow")"></label>
</div>
<div id="activity-toolbar-edit">
<label title="@T("Edit")"></label>
</div>
<div id="activity-toolbar-delete">
<label title="@T("Remove")"></label>
</div>
</div>
</div>
</div>
<div id="activity-toolbox">
@Display.ActivityToolbox(Model)
</div>
<div id="workflow-footer"></div>
</div>
using (Script.Head()) {
<script type="text/javascript">