--HG--
branch : 1.x
extra : rebase_source : 0c5d6b758848adb8d74a8940d2e12f5c82192501
This commit is contained in:
Sebastien Ros
2013-01-31 14:44:03 -08:00
parent ffa4b52c87
commit 94a4ffa4f5
7 changed files with 122 additions and 38 deletions

View File

@@ -4,6 +4,36 @@ namespace Orchard.Workflows {
public class ResourceManifest : IResourceManifestProvider {
public void BuildManifests(ResourceManifestBuilder builder) {
builder.Add().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-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");
builder.Add().DefineStyle("WorkflowsActivities").SetDependencies(
"WorkflowsActivities-Branch",
"WorkflowsActivities-ContentCreate",
"WorkflowsActivities-ContentPublished",
"WorkflowsActivities-ContentRemoved",
"WorkflowsActivities-ContentVersioned",
"WorkflowsActivities-Decision",
"WorkflowsActivities-IsInRole",
"WorkflowsActivities-Notify",
"WorkflowsActivities-Publish",
"WorkflowsActivities-SendEmail",
"WorkflowsActivities-Timer",
"WorkflowsActivities-UserTask"
);
}
}
}

View File

@@ -71,10 +71,11 @@
// create a new activity node on the editor
$('.activity-toolbox-item').on('click', function () {
var self = $(this);
var activityName = self.data('activity-name');
$('.activity-toolbox-item').draggable({ helper: 'clone' });
$('.activity-editor').droppable({ drop: function(event, ui) {
var activityName = ui.draggable.data('activity-name');
createActivity(activityName);
}
});
var renderActivity = function (clientId, name, state, start, top, left) {

View File

@@ -65,11 +65,6 @@
height: 100%;
}
#activity-editor {
position: relative;
min-height: 500px; /* real browsers */
height: auto !important; /* real browsers */
}
.connection-label {
z-index: 10;
@@ -85,27 +80,48 @@
filter: alpha(opacity=80);
}
#workflow-container {
width:auto;
margin:0 auto;
background:#99c;
}
#activity-editor {
position: relative;
float:left;
min-height: 500px; /* real browsers */
height: auto !important; /* real browsers */
}
/* toolbox */
#activity-toolbox {
padding: 0 5px;
height: 100px;
width: 300px;
height: 500px;
overflow-y: scroll;
overflow-x: hidden;
border: 1px solid #E4E5E6;
background-color: #F3F4F5;
float: right;
}
#activity-toolbox .activity-toolbox-item {
display: block;
float: left;
margin: 5px 5px;
padding: 0 10px;
width: auto;
border: 1px solid #EAEAEA;
background-color: white;
}
#activity-toolbox .activity-toolbox-item h2 {
padding: 2px;
#activity-toolbox .activity-toolbox-item > div {
display: block;
padding: 0 5px 0 10px;
width: auto;
height: auto;
}
#activity-toolbox .activity-toolbox-item > div > h2 {
color: #333;
font-size: 1.077em;
}

View File

@@ -6,6 +6,16 @@
background-position: center;
}
.toolbox-branch {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAJlJREFUSEvtk8sJwCAQBe3JBmzBsqzBfqzAVjx52GhAkM0jagyC4GEum2dm/awgoi6stSSlhBhjUgSv48AiJ8YotNZQllFKUQgBruXAIucIj7AGFhFLx6Km7HZkVzWw+MbeQu89vKMZnHPp10DYeolf4SfxELaOajbXDHD2E/YO9F+5uwv0MVO6K92iTGYkd4RHeDMkXDsWhi7rGDeiuX27SQAAAABJRU5ErkJggg==');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-branch div {
margin-left: 36px;
}
.exclusive-branch {
width: 36px;
height: 36px;
@@ -14,6 +24,16 @@
background-position: center;
}
.toolbox-exclusive-branch {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAoklEQVRIS+2TzQnAIAyF3ckFXMGxnMF9nMBVPHlIa0GQ+Kh/baHg4bvEZ14SjSCiLqy1JKWEGGNOCb7HgUFOjFForaFZQilFIQR4lwODnG24DUtgEPHpWpTkbke6KoHBO/5t6L2Hb7SCc+5MDQxbP3EWPonKsDWqVV1TwPmfYe9CP6W7qkCHiVxdrhZpEiO6mUSCMaTbht2J3jSsGNF9vBaGDk3NF8LuD+uFAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-exclusive-branch div {
margin-left: 36px;
}
.merge-branch {
width: 36px;
height: 36px;
@@ -22,3 +42,12 @@
background-position: center;
}
.toolbox-merge-branch {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAYCAYAAADpnJ2CAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAAk0lEQVRIS+2T0QmAIBRF304u4AqO5Qzu4wSu4pcflsGjkmsqSlAYnJ/btWPiI611FEJAjDFxfygxq0dSSvgyoZSKIQTy3k/rLeESHnQJXx8LLvLueLec54z2qoWc7wvR2Y9QFCastXDRCM65/dOn4yZsofVIS8Dwif8KWwe/Bgxzaje4529hmLOES3gFhog5YxFpA8qKN6JZxNXVAAAAAElFTkSuQmCC');
background-repeat: no-repeat;
background-position: 10px 10px;
}
.toolbox-merge-branch div {
margin-left: 36px;
}

View File

@@ -5,3 +5,13 @@
background-repeat: no-repeat;
background-position: center;
}
.toolbox-timer {
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;
}

View File

@@ -4,18 +4,16 @@
@{
IList<IActivity> allActivities = Model.AllActivities;
foreach (var activity in allActivities) {
Style.Include("workflows-activity-" + activity.Name.ToLower()).Define(x => x.SetDependencies("WidgetsAdmin"));
}
}
<!-- List of available activities -->
<div id="activity-toolbox">
<ul>
@foreach (var activity in allActivities) {
<li class="activity-toolbox-item" data-activity-name="@activity.Name" title="@activity.Description">
<h2>@activity.Name.CamelFriendly()</h2>
<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>

View File

@@ -5,38 +5,38 @@
@{
Layout.Title = @T("Edit Workflow");
Style.Require("WorkflowsAdmin");
Style.Require("WorkflowsActivities");
Script.Require("jQueryUI");
Style.Require("jQueryUI_Orchard");
Script.Include("jquery.jsPlumb-1.3.16-all-min.js");
// var editorShape = ((IShapeFactory)New).Create(activity.Name + "_Editor");
}
@Display.ActivityToolbox(Model)
@{
Script.Include("orchard-workflows.js").AtFoot();
Script.Include("orchard-workflows-serialize.js").AtFoot();
}
@using (Html.BeginFormAntiForgeryPost("Edit")) {
@Html.ValidationSummary()
<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="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>
</div>
</div>
</div>
</div>
using (Script.Head()) {
<script type="text/javascript">
//<![CDATA[