Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workflow cleanup #750

Merged
merged 5 commits into from
Aug 9, 2016
Merged

Workflow cleanup #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
777504d
Add some space between the rule groups
nickvergessen Aug 5, 2016
549f22a
Highlight the check row on hover
nickvergessen Aug 5, 2016
e3ed77a
Rename operations and checks
nickvergessen Aug 5, 2016
09f095d
Add placeholder to the name field
nickvergessen Aug 5, 2016
94ac627
Allow a description for workflow sections
nickvergessen Aug 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/workflowengine/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.workflowengine .operation {
padding: 5px;
padding-bottom: 20px;
margin-bottom: 20px;
border-bottom: #eee 1px solid;
border-left: rgba(0,0,0,0) 1px solid;
}
Expand Down Expand Up @@ -28,6 +30,10 @@
transition: opacity .5s;
}

.workflowengine .operation .check:hover {
background-color: #f8f8f8;
}

.workflowengine .operation .button-delete,
.workflowengine .operation .button-delete-check {
opacity: 0.5;
Expand Down
11 changes: 8 additions & 3 deletions apps/workflowengine/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,19 @@
?>
<div id="<?php p($_['appid']); ?>" class="section workflowengine">
<h2 class="inlineblock"><?php p($_['heading']); ?></h2>

<?php if ($_['description']): ?>
<p><?php p($_['description']); ?></p>
<?php endif; ?>

<script type="text/template" id="operations-template">
<div class="operations"></div>
<button class="button-add-operation"><?php p($l->t('Add operation')); ?></button>
<button class="button-add-operation"><?php p($l->t('Add rule group')); ?></button>
</script>

<script type="text/template" id="operation-template">
<div class="operation{{#if hasChanged}} modified{{/if}}">
<input type="text" class="operation-name" value="{{operation.name}}">
<input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}">
{{! delete only makes sense if the operation is already saved }}
{{#if operation.id}}
<span class="button-delete pull-right icon-delete"></span>
Expand All @@ -56,7 +61,7 @@
</div>
{{/each}}
</div>
<button class="button-add"><?php p($l->t('Add check')); ?></button>
<button class="button-add"><?php p($l->t('Add rule')); ?></button>
{{#if hasChanged}}
{{! reset only makes sense if the operation is already saved }}
{{#if operation.id}}
Expand Down